[PATCH 2/2] ignorecase: Fix git mv on insensitive filesystems
- From
dturner@twopensource.com <dturner@twopensource.com>
- Date
- May 8, 2014, 17:23 UTC
- Message-ID
- <1399569814-20644-3-git-send-email-dturner@twopensource.com>
- In-Reply-To
- <1399569814-20644-1-git-send-email-dturner@twopensource.com>
From: David Turner <dturner@twitter.com>
Make it possible to change the case of a filename on a case-insensitive filesystem using git mv. Change git mv to allow moves where the destination file exists if the destination file has the same name as the source file ignoring case.
Signed-off-by: David Turner <dturner@twitter.com> --- builtin/mv.c | 3 ++- t/t6039-merge-ignorecase.sh | 2 +- 2 files changed, 3 insertions(+), 2 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) { /* diff --git a/t/t6039-merge-ignorecase.sh b/t/t6039-merge-ignorecase.sh index dfc9f17..a977653 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 &&
-- 2.0.0.rc0.33.g27630aa