mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-05 05:56:13 +02:00
Code

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
This commit is contained in:
Junio C Hamano 2021-03-19 15:25:40 -07:00
parent bfcc6e2a68 93c3d297b5
commit ef486a9ecf
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/mv.c
View File

@ -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");