From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Mike Hommey <mh@glandium.org>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH] blame: Allow to blame paths freshly added to the index
Date: Fri, 15 Jul 2016 12:45:15 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.20.1607151242020.6426@virtualbox> (raw)
In-Reply-To: <20160715024254.29186-1-mh@glandium.org>
Hi Mike,
On Fri, 15 Jul 2016, Mike Hommey wrote:
> When blaming files, changes in the work tree are taken into account
> and displayed as being "Not Committed Yet".
>
> However, when blaming a file that is not known to the current HEAD,
> git blame fails with `no such path 'foo' in HEAD`, even when the file
> was git add'ed.
>
> This would seem uninteresting with the plain `git blame` case, which
> it is, but it becomes useful when using copy detection, and the new file
> was created from pieces already in HEAD, moved or copied from other
> files.
> ---
Well explained.
Please add your sign-off.
> static struct commit_list **append_parent(struct commit_list **tail, const unsigned char *sha1)
> diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh
> index a9b266f..a0a09e2 100755
> --- a/t/t8003-blame-corner-cases.sh
> +++ b/t/t8003-blame-corner-cases.sh
> @@ -137,6 +137,29 @@ test_expect_success 'blame wholesale copy and more' '
>
> '
>
> +test_expect_success 'blame wholesale copy and more in the index' '
> +
> + {
> + echo ABC
> + echo DEF
> + echo XXXX
> + echo YYYY
> + echo GHIJK
> + } >horse &&
A more common way to do this in our test scripts is by using here
documents. However, in this case I would suggest
test_write_lines ABC DEF XXXX YYYY GHIJK >horse
instead. The equivalent applies to the 'expected' file below:
> + git add horse &&
> + git blame -f -C -C1 -- horse | sed -e "$pick_fc" >current &&
> + {
> + echo mouse-Initial
> + echo mouse-Second
> + echo cow-Fifth
> + echo horse-Not
> + echo mouse-Third
> + } >expected &&
> + test_cmp expected current &&
> + git rm -f horse
Should this not be a
test_when_finished "git rm -f horse"
at the beginning?
Otherwise it looks really good to me.
Ciao,
Dscho
next prev parent reply other threads:[~2016-07-15 10:45 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 [this message]
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
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=alpine.DEB.2.20.1607151242020.6426@virtualbox \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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).