summaryrefslogtreecommitdiff
path: root/contrib/completion/git-prompt.sh
diff options
context:
space:
mode:
authorTorsten Bögershausen <tboegi@web.de>2021-03-01 21:41:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-03-04 01:07:12 (GMT)
commit93c3d297b5060a59715b8e8bc719d8e60ecf8106 (patch)
treedfa81715b43454a1f2509394a54321ffcde0dfb9 /contrib/completion/git-prompt.sh
parent9b906af657d4ec0bc8fc01c5cbbbddb582a8cac6 (diff)
downloadgit-93c3d297b5060a59715b8e8bc719d8e60ecf8106.zip
git-93c3d297b5060a59715b8e8bc719d8e60ecf8106.tar.gz
git-93c3d297b5060a59715b8e8bc719d8e60ecf8106.tar.bz2
git mv foo FOO ; git mv foo bar gave an assert
The following sequence, on a case-insensitive file system, (strictly speeking with core.ignorecase=true) leads to an assertion failure 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" later in the code and keeps setting up the "ce" pointer for ce_stage(ce) done in the next else if. This fixes https://github.com/git-for-windows/git/issues/2920 Reported-By: Dan Moseley <Dan.Moseley@microsoft.com> Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/completion/git-prompt.sh')
0 files changed, 0 insertions, 0 deletions