mirror of
https://github.com/git/git.git
synced 2024-10-28 12:59:41 +01:00
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:
commit
ef486a9ecf
1 changed files with 1 additions and 1 deletions
|
@ -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");
|
||||
|
|
Loading…
Reference in a new issue