Browse Source

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
maint
Junio C Hamano 4 years ago
parent
commit
ef486a9ecf
  1. 2
      builtin/mv.c

2
builtin/mv.c

@ -221,7 +221,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix) @@ -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…
Cancel
Save