diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-06 18:23:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-06 18:23:13 (GMT) |
| commit | 067fe6435534588bfd63857663532861d711d56e (patch) | |
| tree | a60a6ba1b8fb6b65e380c17b721be6d6bdf03320 /builtin/mv.c | |
| parent | f7f349e1383077fb9e1c03335a372b52a19ab2f0 (diff) | |
| parent | baa37bff9a845471754d3f47957d58a6ccc30058 (diff) | |
| download | git-067fe6435534588bfd63857663532861d711d56e.zip git-067fe6435534588bfd63857663532861d711d56e.tar.gz git-067fe6435534588bfd63857663532861d711d56e.tar.bz2 | |
Merge branch 'dt/merge-recursive-case-insensitive'
On a case insensitive filesystem, merge-recursive incorrectly
deleted the file that is to be renamed to a name that is the same
except for case differences.
* dt/merge-recursive-case-insensitive:
mv: allow renaming to fix case on case insensitive filesystems
merge-recursive.c: fix case-changing merge bug
Diffstat (limited to 'builtin/mv.c')
| -rw-r--r-- | builtin/mv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/mv.c b/builtin/mv.c index 2a7243f..180ef99 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -203,7 +203,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) { /* |