summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-03-19 22:25:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-03-19 22:25:40 (GMT)
commitef486a9ecfc73512d515644cc02f7ad9a229c533 (patch)
tree0a4a1d56391ebde5d44cf987c6682b9173f7d637 /builtin
parentbfcc6e2a68b95ee71fc606a2e3917af78f1130f9 (diff)
parent93c3d297b5060a59715b8e8bc719d8e60ecf8106 (diff)
downloadgit-ef486a9ecfc73512d515644cc02f7ad9a229c533.zip
git-ef486a9ecfc73512d515644cc02f7ad9a229c533.tar.gz
git-ef486a9ecfc73512d515644cc02f7ad9a229c533.tar.bz2
Merge branch 'tb/git-mv-icase-fix'
Fix a corner case bug in "git mv" on case insensitive systems, which was introduced in 2.29 timeframe. * tb/git-mv-icase-fix: git mv foo FOO ; git mv foo bar gave an assert
Diffstat (limited to 'builtin')
-rw-r--r--builtin/mv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/mv.c b/builtin/mv.c
index 7dac714..3fccdcb 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -221,7 +221,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
}
argc += last - first;
}
- } else if (!(ce = cache_file_exists(src, length, ignore_case))) {
+ } else if (!(ce = cache_file_exists(src, length, 0))) {
bad = _("not under version control");
} else if (ce_stage(ce)) {
bad = _("conflicted");