From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Ramkumar Ramachandra <artagnon@gmail.com>
Cc: Git List <git@vger.kernel.org>,
Avery Pennarun <apenwarr@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] t4202 (log): add failing test for log with subtree
Date: Mon, 22 Apr 2013 14:36:49 +0200 [thread overview]
Message-ID: <vpqip3eoi72.fsf@grenoble-inp.fr> (raw)
In-Reply-To: <CALkWK0nMgbZY7E-wPNj2C7W98Y4HtQ7Hss6uMKngajB5iJrjDw@mail.gmail.com> (Ramkumar Ramachandra's message of "Mon, 22 Apr 2013 17:59:25 +0530")
Ramkumar Ramachandra <artagnon@gmail.com> writes:
> Matthieu Moy wrote:
>> This is somehow expected: the subtree merge changed the filename during
>> merge (it is subtree/file.txt after the merge, and just file.txt
>> before), so "git log" without --follow just considers the file appeared.
>
> No, a merge does not "change" any filenames.
Read again my message, especially the "it is subtree/file.txt after the
merge, and just file.txt before" part. Replace "subtree" with "bar" and
"file.txt" with "ichi".
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2013-04-22 12:36 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-22 12:08 [PATCH] t4202 (log): add failing test for log with subtree Ramkumar Ramachandra
2013-04-22 12:11 ` Matthieu Moy
2013-04-22 12:17 ` Thomas Rast
2013-04-22 12:37 ` Ramkumar Ramachandra
2013-04-22 12:54 ` Ramkumar Ramachandra
2013-04-22 12:29 ` Ramkumar Ramachandra
2013-04-22 12:36 ` Matthieu Moy [this message]
2013-04-22 13:15 ` Thomas Rast
2013-04-22 13:19 ` Thomas Rast
2013-04-22 14:30 ` Ramkumar Ramachandra
2013-04-22 14:57 ` Ramkumar Ramachandra
2013-04-22 15:24 ` Thomas Rast
2013-04-22 15:46 ` Ramkumar Ramachandra
2013-04-22 15:50 ` Ramkumar Ramachandra
2013-04-22 15:54 ` Ramkumar Ramachandra
2013-04-22 17:29 ` Ramkumar Ramachandra
2013-04-22 19:15 ` Thomas Rast
2013-04-22 19:54 ` Ramkumar Ramachandra
2013-04-22 21:00 ` Philip Oakley
2013-04-22 21:08 ` Ramkumar Ramachandra
2013-04-22 21:23 ` Ramkumar Ramachandra
2013-04-22 21:06 ` Matthieu Moy
2013-04-22 21:59 ` Junio C Hamano
2013-04-22 22:52 ` Ramkumar Ramachandra
2013-04-22 22:59 ` Ramkumar Ramachandra
2013-04-22 23:55 ` Junio C Hamano
2013-04-23 7:53 ` Ramkumar Ramachandra
2013-04-23 16:03 ` Junio C Hamano
2013-04-23 16:29 ` Ramkumar Ramachandra
2013-04-22 16:32 ` Junio C Hamano
2013-04-22 18:00 ` Ramkumar Ramachandra
2013-04-22 18:18 ` Matthieu Moy
2013-04-22 19:09 ` Junio C Hamano
2013-04-22 20:39 ` Ramkumar Ramachandra
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=vpqip3eoi72.fsf@grenoble-inp.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=apenwarr@gmail.com \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.