Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
rebase -m: do not trigger pre-commit verification
[gitweb.git]
/
builtin-diff.c
diff --git
a/builtin-diff.c
b/builtin-diff.c
index 29365a0b17348982ea806add83f3c95bea43d4f6..8d7a5697f2b429f6240a89e28422f48ef18aee3b 100644
(file)
--- a/
builtin-diff.c
+++ b/
builtin-diff.c
@@
-190,7
+190,7
@@
static void refresh_index_quietly(void)
refresh_cache(REFRESH_QUIET|REFRESH_UNMERGED);
if (active_cache_changed &&
- !write_cache(fd, active_cache, active_nr)
&& !close(fd)
)
+ !write_cache(fd, active_cache, active_nr))
commit_locked_index(lock_file);
rollback_lock_file(lock_file);