diff options
| author | David Turner <dturner@twitter.com> | 2014-05-08 10:23:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-05-08 14:34:00 -0700 |
| commit | baa37bff9a845471754d3f47957d58a6ccc30058 (patch) | |
| tree | 7c325075844e18a2eac8e1059694d3f0be403dd8 | |
| parent | ae352c7f37ef2098e03ee86bc7fd75b210b17683 (diff) | |
| download | git-dt/merge-recursive-case-insensitive.tar.gz | |
mv: allow renaming to fix case on case insensitive filesystemsdt/merge-recursive-case-insensitive
"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 <dturner@twitter.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/mv.c | 3 | ||||
| -rwxr-xr-x | t/t6039-merge-ignorecase.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/builtin/mv.c b/builtin/mv.c index 45e57f307b..f4d89d0640 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) { /* diff --git a/t/t6039-merge-ignorecase.sh b/t/t6039-merge-ignorecase.sh index dfc9f17a2d..a977653147 100755 --- a/t/t6039-merge-ignorecase.sh +++ b/t/t6039-merge-ignorecase.sh @@ -35,7 +35,7 @@ test_expect_success 'merge with case-changing rename on both sides' ' git reset --hard baseline && git branch -D with-camel && git checkout -b with-camel && - git mv --force TestCase testcase && + git mv TestCase testcase && git commit -m "recase on branch" && >foo && git add foo && |