RE: [EXTERNAL] [PATCH v2 1/1] git mv foo FOO ; git mv foo bar gave an assert
From: Dan Moseley <hidden>
Date: 2021-03-01 20:26:56
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2021-03-01 · Re: [EXTERNAL] [PATCH v2 1/1] git mv foo FOO ; git mv foo bar gave an assert · Junio C Hamano <hidden>
quoted hunk
From: Torsten Bögershausen <redacted> 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" The bugfix is to change the "file exist case-insensitive in the index" into the correct "file exist (case-sensitive) in the index". This avoids the "assert". Reported-By: Dan Moseley <redacted> This fixes https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgithub.com%2Fgit-for-windows%2Fgit%2Fissues%2F2920&data=04%7C01%7CDan.Moseley%40microsoft.com%7Cb659ba5925c543bcc3e708d8dcd41268%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C637502150683596627%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=%2BLjQf5NooTUgOKbsyn10XCFIAgMw9v%2BKlhx8kDD6%2BIg%3D&reserved=0 Signed-off-by: Torsten Bögershausen <redacted> --- builtin/mv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)diff --git a/builtin/mv.c b/builtin/mv.c index 7dac714af9..3fccdcb645 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"); --2.30.0.155.g66e871b664
Thank you Thorsten. This makes sense to me. Do you want to add a test? I believe this is what I had in my original patch, that worked pretty well:
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 63d5f41a12..5c7fee9bd8 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh@@ -152,6 +152,14 @@ test_expect_success \ 'move into "."' \ 'git mv path1/path2/ .' +test_expect_success \ + 'fail to move file already in index under different cased name' \ + 'echo 1 > foo && + git add foo && + git commit -m add_file -- foo && + git mv foo FOO && + test_expect_code 128 git mv foo BAR' + test_expect_success "Michael Cassar's test case" ' rm -fr .git papers partA && git init && --
2.25.1