From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: Question on range-diff and notes.displayref
Date: Tue, 31 Jul 2018 11:17:44 -0700 [thread overview]
Message-ID: <xmqqva8vb77b.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <CABPp-BH+YW6z147K-X7eTH2E9A3tUzteosKA1KadhSavM5c8Lg@mail.gmail.com> (Elijah Newren's message of "Tue, 31 Jul 2018 10:19:15 -0700")
Elijah Newren <newren@gmail.com> writes:
> Should git notes show up in a range-diff? I happened to have
> notes.displayref=refs/notes/amlog
> set in my git.git repo, and saw the below in my range-diff:
>
> On Tue, Jul 31, 2018 at 10:12 AM, Elijah Newren <newren@gmail.com> wrote:
>> 1: 4a1c9c3368 ! 1: 00f94a8b41 t1015: demonstrate directory/file conflict recovery failures
>> @@ -14,7 +14,6 @@
>>
>> Signed-off-by: Elijah Newren <newren@gmail.com>
>> Signed-off-by: Junio C Hamano <gitster@pobox.com>
>> - Message-Id: <20180713163331.22446-2-newren@gmail.com>
>>
>> diff --git a/t/t1015-read-index-unmerged.sh b/t/t1015-read-index-unmerged.sh
>> new file mode 100755
>> 2: e105e8bfbd ! 2: d3b8d7edb6 read-cache: fix directory/file conflict handling in read_index_unmerged()
>> @@ -59,7 +59,6 @@
>>
>> Signed-off-by: Elijah Newren <newren@gmail.com>
>> Signed-off-by: Junio C Hamano <gitster@pobox.com>
>> - Message-Id: <20180713163331.22446-3-newren@gmail.com>
>>
> <snip>
>
> Maybe this is expected or wanted (tbdiff also shows the git notes for
> what it's worth), but it seemed somewhat surprising to me. I'd rather
> not see such "differences" displayed for the patch series that I'm
> submitting, but perhaps others see it differently?
I was surprised to see that, too, but if you have it configured I
would understand the behaviour.
Of course, the value of showing the Message-Id: in this particular
case is dubious (by definition you won't have them on the side that
you have not posted), but if you are comparing two iterations that
have been queued (e.g. by keeping the old tips of the topic branch
unpruned by holding onto historical 'origin/pu' using reflog), it
may become useful when doing a "Wait, is that really my bogosity?
Let's go see the list archive using the message ID---ah, something
was suggested in the review and the maintainer attempted to pick it
up and squash it in, which he botched".
prev parent reply other threads:[~2018-07-31 18:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-31 17:19 Question on range-diff and notes.displayref Elijah Newren
2018-07-31 18:17 ` Junio C Hamano [this message]
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=xmqqva8vb77b.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=newren@gmail.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 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 NNTP newsgroup(s).