From: Junio C Hamano <gitster@pobox.com>
To: Mike Hommey <mh@glandium.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] blame: Allow to blame paths freshly added to the index
Date: Mon, 18 Jul 2016 11:49:28 -0700 [thread overview]
Message-ID: <xmqqbn1ukchz.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20160715231656.iztvtftk5ttrzeow@glandium.org> (Mike Hommey's message of "Sat, 16 Jul 2016 08:16:56 +0900")
Mike Hommey <mh@glandium.org> writes:
>> I suspect that this would be useful without copy detection. If you
>> "git mv fileA fileB" (optionally followed by "edit fileB"), fileB
>> would not be in HEAD but you should be able to trace the lineage of
>> the lines in it back through the renaming event, and this change
>> also allows that use case, no?
>
> It should, but that'd be copy/move detection, wouldn't it? :)
Actually, in the context of "git blame", there is no extra
"detection" needed for following a whole file rename.
>> But the user can be in the same conflicted rename situation with
>> "git am -3" or cherry-pick, and in these cases there won't be extra
>> parent commits for the fake work tree commit, hence the conclusion
>> does not change.
>
> Indeed, with cherry-pick, the "no such path in HEAD" error is happening
> with the patch.
OK.
next prev parent reply other threads:[~2016-07-18 18:50 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-15 2:42 [PATCH] blame: Allow to blame paths freshly added to the index Mike Hommey
2016-07-15 10:45 ` Johannes Schindelin
2016-07-15 12:32 ` Mike Hommey
2016-07-15 12:37 ` Jeff King
2016-07-15 12:42 ` Mike Hommey
2016-07-15 12:55 ` [PATCH v2] " Mike Hommey
2016-07-15 15:28 ` Johannes Schindelin
2016-07-15 20:58 ` [PATCH] " Junio C Hamano
2016-07-15 21:14 ` Junio C Hamano
2016-07-15 23:16 ` Mike Hommey
2016-07-18 18:49 ` Junio C Hamano [this message]
2016-07-15 23:23 ` [PATCH v3 1/2] " Mike Hommey
2016-07-15 23:23 ` [PATCH v3 2/2] t/t8003-blame-corner-cases.sh: Use here documents Mike Hommey
2016-07-16 13:05 ` Johannes Schindelin
2016-07-18 18:52 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqbn1ukchz.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=mh@glandium.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).