diff options
| author |   Junio C Hamano <gitster@pobox.com> | 2021-03-19 15:25:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-19 15:25:40 -0700 |
| commit | ef486a9ecfc73512d515644cc02f7ad9a229c533 (patch) | |
| tree | 0a4a1d56391ebde5d44cf987c6682b9173f7d637 | |
| parent | Merge branch 'rs/xcalloc-takes-nelem-first' (diff) | |
| parent | git mv foo FOO ; git mv foo bar gave an assert (diff) | |
| download | git-ef486a9ecfc73512d515644cc02f7ad9a229c533.tar.xz git-ef486a9ecfc73512d515644cc02f7ad9a229c533.zip | |
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
| -rw-r--r-- | builtin/mv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/mv.c b/builtin/mv.c index 7dac714af90..3fccdcb6452 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"); |