Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
merge-recursive: ignore_case shouldn't reject intentional removals
[gitweb.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index 1d3f8f0d22157e11c1e0db6f230e39240d2f3e63..aa6ae7ec8241bef5a4bc4a73ca4f16017636012a 100644
(file)
--- a/
merge-recursive.c
+++ b/
merge-recursive.c
@@
-646,7
+646,7
@@
static int remove_file(struct merge_options *o, int clean,
if (ignore_case) {
struct cache_entry *ce;
ce = cache_file_exists(path, strlen(path), ignore_case);
- if (ce && ce_stage(ce) == 0)
+ if (ce && ce_stage(ce) == 0
&& strcmp(path, ce->name)
)
return 0;
}
if (remove_path(path))