undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refresh_index_quietly(): express "optional" nature of index writing better

Browse Source 
The point of the part of the code this patch touches is that if
we modified the active_cache, we try to write it out and make it
the index file for later users to use by calling
"commit_locked_index", but we do not really care about the
failure from this sequence because it is done purely as an
optimization.

The original code called three functions primarily for their
side effects but as condition of an if statement, which is
admittedly a bad style.

Incidentally, it squelches an "empty if body" warning from gcc.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2007-11-08 16:24:00 -08:00
parent 4f2e94c0f7
commit fbbdbfc3cc
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
builtin-diff.c
View File

@ -200,15 +200,11 @@ static void refresh_index_quietly(void)
discard_cache(); discard_cache();
read_cache(); read_cache();
refresh_cache(REFRESH_QUIET|REFRESH_UNMERGED); refresh_cache(REFRESH_QUIET|REFRESH_UNMERGED);
if (active_cache_changed) {
if (write_cache(fd, active_cache, active_nr) || if (active_cache_changed &&
close(fd) || !write_cache(fd, active_cache, active_nr) && !close(fd))
commit_locked_index(lock_file)) commit_locked_index(lock_file);
; /*
* silently ignore it -- we haven't mucked
* with the real index.
*/
}
rollback_lock_file(lock_file); rollback_lock_file(lock_file);
} }