From: Junio C Hamano <gitster@pobox•com>
To: dturner@twopensource•com
Cc: git@vger•kernel.org, David Turner <dturner@twitter•com>
Subject: Re: [PATCH 2/2] ignorecase: Fix git mv on insensitive filesystems
Date: Thu, 08 May 2014 12:54:55 -0700 [thread overview]
Message-ID: <xmqqha502ghc.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1399569814-20644-3-git-send-email-dturner@twopensource.com> (dturner@twopensource.com's message of "Thu, 8 May 2014 10:23:34 -0700")
dturner@twopensource•com writes:
> 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))) {
Hmm, I would find it easier to read if it were:
... if (lstat(dst, &st) == 0 &&
!(ignore_case && !strcasecmp(src, dst))) {
That is, "it is an error for dst to exist, unless we are on a case
insensitive filesystem and src and dst refer to the same file.", but
maybe it is just me.
More importantly, what is the end-user visible effect of this
change? Is it fair to summarize it like this?
On a case-insensitive filesystem, "mv hello.txt Hello.txt"
always trigger the "dst already exists" error, because both
names refer to the same file to MS-DOS, requiring the user to
pass the "--force" option. Allow it without "--force".
Overwriting an existing file with "mv hello.txt Hello.txt" on a case
sensitive filesystem *is* an unusual operation, and that is the
reason why we require "--force" to make sure that the user means it.
I have a slight suspicion that the same "mv hello.txt Hello.txt" on
a case insensitive filesystem, where two names are known (to the end
user of such a filesystem) to refer to the same path would equally
be a very unusual thing to do, and such an operation may deserve a
similar safety precaution to make sure that the user really meant to
do so by requiring "--force".
So, I dunno.
> 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 &&
next prev parent reply other threads:[~2014-05-08 19:55 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-29 19:02 Bug: Case-insensitive filesystems can cause merge and checkout problems David Turner
2014-05-02 0:21 ` [PATCH] merge-recursive.c: Fix case-changing merge bug David Turner
2014-05-06 17:07 ` Junio C Hamano
2014-05-06 17:36 ` David Turner
2014-05-06 19:46 ` Junio C Hamano
2014-05-06 22:59 ` [PATCH 1/2] merge-recursive.c: Fix case-changing merge dturner
2014-05-06 22:59 ` [PATCH 2/2] ignorecase: Fix git mv on insensitive filesystems dturner
2014-05-07 6:17 ` Johannes Sixt
2014-05-07 16:42 ` David Turner
2014-05-07 17:46 ` Junio C Hamano
2014-05-07 18:01 ` David Turner
2014-05-08 6:37 ` Johannes Sixt
2014-05-08 8:55 ` Torsten Bögershausen
2014-05-08 17:23 ` [PATCH 0/2] " dturner
2014-05-08 17:23 ` [PATCH 1/2] merge-recursive.c: Fix case-changing merge dturner
2014-05-08 19:45 ` Junio C Hamano
2014-05-08 17:23 ` [PATCH 2/2] ignorecase: Fix git mv on insensitive filesystems dturner
2014-05-08 19:54 ` Junio C Hamano [this message]
2014-05-08 20:40 ` David Turner
2014-05-08 20:55 ` Junio C Hamano
2014-05-08 1:22 ` brian m. carlson
2014-05-07 18:01 ` [PATCH 1/2] merge-recursive.c: Fix case-changing merge Junio C Hamano
2014-05-07 18:13 ` Jonathan Nieder
2014-05-07 20:53 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2014-05-08 20:48 [PATCH 2/2] ignorecase: Fix git mv on insensitive filesystems Thomas Braun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqha502ghc.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=dturner@twitter$(echo .)com \
--cc=dturner@twopensource$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox