path: root/builtin/mv.c
diff options
authorDavid Turner <>2014-05-08 17:23:34 (GMT)
committerJunio C Hamano <>2014-05-08 21:34:00 (GMT)
commitbaa37bff9a845471754d3f47957d58a6ccc30058 (patch)
tree7c325075844e18a2eac8e1059694d3f0be403dd8 /builtin/mv.c
parentae352c7f37ef2098e03ee86bc7fd75b210b17683 (diff)
mv: allow renaming to fix case on case insensitive filesystems
"git mv hello.txt Hello.txt" on a case insensitive filesystem always triggers "destination already exists" error, because these two names refer to the same path from the filesystem's point of view, and requires the user to give "--force" when correcting the case of the path recorded in the index and in the next commit. Detect this case and allow it without requiring "--force". Signed-off-by: David Turner <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'builtin/mv.c')
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/mv.c b/builtin/mv.c
index 45e57f3..f4d89d0 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -202,7 +202,8 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
} else if (cache_name_pos(src, length) < 0)
bad = _("not under version control");
- else if (lstat(dst, &st) == 0) {
+ else if (lstat(dst, &st) == 0 &&
+ (!ignore_case || strcasecmp(src, dst))) {
bad = _("destination exists");
if (force) {