From: Ittay Dror <ittayd@tikalk•com>
To: Jeff King <peff@peff•net>
Cc: git@vger•kernel.org
Subject: Re: detecting rename->commit->modify->commit
Date: Thu, 01 May 2008 18:24:30 +0300 [thread overview]
Message-ID: <4819E0AE.40602@tikalk.com> (raw)
In-Reply-To: <4819DCF1.7090504@tikalk.com>
Btw, this happened to me in a real use case. I wanted to restructure a
source tree. So I put it under git and started to happily move things
around, always committing after a move. I thought that git will
correctly identify these moves and show me the differences I made after
(in a separate commit). But it doesn't, and now that I want to prepare a
summary of the changes I've made, I'm stuck with a huge diff that is
hard to make sense of.
Ittay
Ittay Dror wrote:
> But it doesn't work across directories :-(.
>
> Try:
> >mkdir foo
> >echo "hello" > foo/A
> >git add foo/A
> >git commit -m 'foo/A'
> >mkdir bar
> >git mv foo/A bar
> >git commit -m 'bar/A'
> >echo "world" >> bar/A
> >git add bar/A
> >git commit -m 'bar/A world'
> >git diff HEAD^^..HEAD^ | cat
> diff --git a/foo/A b/bar/A
> similarity index 100%
> rename from foo/A
> rename to bar/A
> > git diff HEAD^^.. | cat
> diff --git a/bar/A b/bar/A
> new file mode 100644
> index 0000000..94954ab
> --- /dev/null
> +++ b/bar/A
> @@ -0,0 +1,2 @@
> +hello
> +world
> diff --git a/foo/A b/foo/A
> deleted file mode 100644
> index ce01362..0000000
> --- a/foo/A
> +++ /dev/null
> @@ -1 +0,0 @@
> -hello
>
>
>
>
>
> Jeff King wrote:
>> On Thu, May 01, 2008 at 05:10:24PM +0300, Ittay Dror wrote:
>>
>>
>>> Say I have a file A, I rename to 'B', commit, then change file B
>>> and commit. Does 'git diff -M HEAD^^..' detect that? From what I
>>> see now, it will show 'B' as new (all of it with '+' prefix in the
>>> output). Am I right?
>>>
>>
>> Yes, it should find it, assuming the changes to B leave it recognizable.
>> Try:
>>
>> mkdir repo && cd repo && git init
>> cp /usr/share/dict/words A
>> git add . && git commit -m added
>> mv A B && git add B && git commit -a -m rename
>> echo change >>B && git commit -a -m change
>> git diff -M HEAD^^.. | head -n 7
>>
>> You should see something like:
>>
>> diff --git a/A b/B
>> similarity index 99%
>> rename from A
>> rename to B
>> index 8e50f11..6525618 100644
>> --- a/A
>> +++ b/B
>>
>> However, note the similarity index. If you change B so much that it
>> doesn't look close to the original A, then the rename is not detected
>> (and intentionally so -- the argument is that it is no longer a rename
>> in that context, but a rewritten file).
>>
>> -Peff
>> --
>> To unsubscribe from this list: send the line "unsubscribe git" in
>> the body of a message to majordomo@vger•kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>
>>
>
--
Ittay Dror <ittayd@tikalk•com>
Tikal <http://www.tikalk.com>
Tikal Project <http://tikal.sourceforge.net>
next prev parent reply other threads:[~2008-05-01 15:25 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-01 14:10 detecting rename->commit->modify->commit Ittay Dror
2008-05-01 14:45 ` Jeff King
2008-05-01 15:08 ` Ittay Dror
2008-05-01 15:20 ` Jeff King
2008-05-01 15:30 ` Ittay Dror
2008-05-01 15:38 ` Jeff King
2008-05-01 15:47 ` Jakub Narebski
2008-05-01 20:39 ` Teemu Likonen
2008-05-01 23:09 ` Jeff King
2008-05-02 2:06 ` Sitaram Chamarty
2008-05-02 2:38 ` Junio C Hamano
2008-05-02 16:59 ` Sitaram Chamarty
2008-05-01 15:24 ` Ittay Dror [this message]
2008-05-01 15:28 ` Jeff King
2008-05-01 14:54 ` Ittay Dror
2008-05-01 15:09 ` Jeff King
2008-05-01 15:20 ` Ittay Dror
2008-05-01 15:30 ` David Tweed
2008-05-01 15:27 ` Avery Pennarun
2008-05-01 15:34 ` Jeff King
2008-05-01 15:50 ` Avery Pennarun
2008-05-01 16:48 ` Jeff King
2008-05-01 19:45 ` Avery Pennarun
2008-05-01 22:42 ` Jeff King
2008-05-01 19:12 ` Steven Grimm
2008-05-01 23:14 ` Jeff King
2008-05-03 17:56 ` merge renamed files/directories? (was: Re: detecting rename->commit->modify->commit) Ittay Dror
2008-05-03 18:11 ` Avery Pennarun
2008-05-04 6:08 ` merge renamed files/directories? Ittay Dror
2008-05-04 9:34 ` Jakub Narebski
2008-05-05 16:40 ` Avery Pennarun
2008-05-05 21:49 ` Robin Rosenberg
2008-05-05 22:20 ` Linus Torvalds
2008-05-05 23:07 ` Steven Grimm
2008-05-06 0:29 ` Linus Torvalds
2008-05-06 0:40 ` Linus Torvalds
2008-05-06 15:47 ` Theodore Tso
2008-05-06 16:10 ` Linus Torvalds
2008-05-06 16:15 ` Linus Torvalds
2008-05-06 16:32 ` Ittay Dror
2008-05-06 16:39 ` Linus Torvalds
2008-05-06 1:38 ` Avery Pennarun
2008-05-06 1:46 ` Shawn O. Pearce
2008-05-06 1:58 ` Avery Pennarun
2008-05-06 2:12 ` Shawn O. Pearce
2008-05-06 2:19 ` Linus Torvalds
2008-05-08 18:17 ` detecting rename->commit->modify->commit Jeff King
2008-05-01 16:39 ` Sitaram Chamarty
2008-05-01 18:58 ` Ittay Dror
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=4819E0AE.40602@tikalk.com \
--to=ittayd@tikalk$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=peff@peff$(echo .)net \
/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