projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
update-cache: remove index lock file on SIGINT
[git.git]
/
diff-cache.c
diff --git
a/diff-cache.c
b/diff-cache.c
index
2ec6c29
..
c7fa84b
100644
(file)
--- a/
diff-cache.c
+++ b/
diff-cache.c
@@
-76,7
+76,7
@@
static void remove_merge_entries(void)
for (i = 0; i < active_nr; i++) {
struct cache_entry *ce = active_cache[i];
if (!ce_stage(ce))
-
break
;
+
continue
;
printf("%s: unmerged\n", ce->name);
while (remove_entry_at(i)) {
if (!ce_stage(active_cache[i]))