mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/index-update-if-able'

Browse Source 
* jc/index-update-if-able:
  update $GIT_INDEX_FILE when there are racily clean entries
  diff/status: refactor opportunistic index update
This commit is contained in:
Junio C Hamano
2011-03-26 20:13:16 -07:00
parent 4d46ee74e1 483fbe2b7c
commit 149971badc
4 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/diff.c
View File

@ -197,12 +197,7 @@ static void refresh_index_quietly(void)
discard_cache();
read_cache();
refresh_cache(REFRESH_QUIET|REFRESH_UNMERGED);
if (active_cache_changed &&
!write_cache(fd, active_cache, active_nr))
commit_locked_index(lock_file);
rollback_lock_file(lock_file);
update_index_if_able(&the_index, lock_file);
}
static int builtin_diff_files(struct rev_info *revs, int argc, const char **argv)