From: Torsten Bögershausen <tboegi@xxxxxx> The following sequence, on a case-insensitive file system, (strictly speeking with core.ignorecase=true) leads to an assertion, and leaves .git/index.lock behind. git init echo foo >foo git add foo git mv foo FOO git mv foo bar This regression was introduced in Commit 9b906af657, "git-mv: improve error message for conflicted file" Don't check if the case-insensitive version is in the index. In the sense of 9b906af657 supply the user with a more helpful message. This fixes https://github.com/git-for-windows/git/issues/2920 Reported-By: Dan Moseley <Dan.Moseley@xxxxxxxxxxxxx> Signed-off-by: Torsten Bögershausen <tboegi@xxxxxx> --- Note: There is an ongoing effort to replace cache_file_exists() with index_file_exists(). So this patch may need to be re-done. Note2: @Dan Moseley: Do you want to continue with this work ? builtin/mv.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/builtin/mv.c b/builtin/mv.c index 7dac714af9..8572a5dae0 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -221,8 +221,11 @@ int cmd_mv(int argc, const char **argv, const char *prefix) } argc += last - first; } - } else if (!(ce = cache_file_exists(src, length, ignore_case))) { - bad = _("not under version control"); + } else if (!(ce = cache_file_exists(src, length, 0))) { + if (cache_file_exists(src, length, ignore_case)) + bad = _("not under version control (upper/lower mixup)"); + else + bad = _("not under version control"); } else if (ce_stage(ce)) { bad = _("conflicted"); } else if (lstat(dst, &st) == 0 && -- 2.28.0.97.gdc04167d37
