{"thread":{"id":"48992","subject":"Question on range-diff and notes.displayref","startedAt":"2018-07-31T17:19:18Z","lastAt":"2018-07-31T18:17:49Z","messageCount":2,"participants":["Elijah Newren","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"354065","messageId":"CABPp-BH+YW6z147K-X7eTH2E9A3tUzteosKA1KadhSavM5c8Lg@mail.gmail.com","threadId":"48992","inReplyTo":null,"subject":"Question on range-diff and notes.displayref","fromName":"Elijah Newren","fromEmail":"newren@gmail.com","sentAt":"2018-07-31T17:19:15Z","receivedAt":"2018-07-31T17:19:18Z","isPatch":false,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"Should git notes show up in a range-diff?  I happened to have\n    notes.displayref=refs/notes/amlog\nset in my git.git repo, and saw the below in my range-diff:\n\nOn Tue, Jul 31, 2018 at 10:12 AM, Elijah Newren <newren@gmail.com> wrote:\n> 1:  4a1c9c3368 ! 1:  00f94a8b41 t1015: demonstrate directory/file conflict recovery failures\n>     @@ -14,7 +14,6 @@\n>\n>          Signed-off-by: Elijah Newren <newren@gmail.com>\n>          Signed-off-by: Junio C Hamano <gitster@pobox.com>\n>     -    Message-Id: <20180713163331.22446-2-newren@gmail.com>\n>\n>      diff --git a/t/t1015-read-index-unmerged.sh b/t/t1015-read-index-unmerged.sh\n>      new file mode 100755\n> 2:  e105e8bfbd ! 2:  d3b8d7edb6 read-cache: fix directory/file conflict handling in read_index_unmerged()\n>     @@ -59,7 +59,6 @@\n>\n>          Signed-off-by: Elijah Newren <newren@gmail.com>\n>          Signed-off-by: Junio C Hamano <gitster@pobox.com>\n>     -    Message-Id: <20180713163331.22446-3-newren@gmail.com>\n>\n<snip>\n\n\nMaybe this is expected or wanted (tbdiff also shows the git notes for\nwhat it's worth), but it seemed somewhat surprising to me.  I'd rather\nnot see such \"differences\" displayed for the patch series that I'm\nsubmitting, but perhaps others see it differently?\n\nElijah\n"},{"id":"354098","messageId":"xmqqva8vb77b.fsf@gitster-ct.c.googlers.com","threadId":"48992","inReplyTo":"CABPp-BH+YW6z147K-X7eTH2E9A3tUzteosKA1KadhSavM5c8Lg@mail.gmail.com","subject":"Re: Question on range-diff and notes.displayref","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-07-31T18:17:44Z","receivedAt":"2018-07-31T18:17:49Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Elijah Newren <newren@gmail.com> writes:\n\n> Should git notes show up in a range-diff?  I happened to have\n>     notes.displayref=refs/notes/amlog\n> set in my git.git repo, and saw the below in my range-diff:\n>\n> On Tue, Jul 31, 2018 at 10:12 AM, Elijah Newren <newren@gmail.com> wrote:\n>> 1:  4a1c9c3368 ! 1:  00f94a8b41 t1015: demonstrate directory/file conflict recovery failures\n>>     @@ -14,7 +14,6 @@\n>>\n>>          Signed-off-by: Elijah Newren <newren@gmail.com>\n>>          Signed-off-by: Junio C Hamano <gitster@pobox.com>\n>>     -    Message-Id: <20180713163331.22446-2-newren@gmail.com>\n>>\n>>      diff --git a/t/t1015-read-index-unmerged.sh b/t/t1015-read-index-unmerged.sh\n>>      new file mode 100755\n>> 2:  e105e8bfbd ! 2:  d3b8d7edb6 read-cache: fix directory/file conflict handling in read_index_unmerged()\n>>     @@ -59,7 +59,6 @@\n>>\n>>          Signed-off-by: Elijah Newren <newren@gmail.com>\n>>          Signed-off-by: Junio C Hamano <gitster@pobox.com>\n>>     -    Message-Id: <20180713163331.22446-3-newren@gmail.com>\n>>\n> <snip>\n>\n> Maybe this is expected or wanted (tbdiff also shows the git notes for\n> what it's worth), but it seemed somewhat surprising to me.  I'd rather\n> not see such \"differences\" displayed for the patch series that I'm\n> submitting, but perhaps others see it differently?\n\nI was surprised to see that, too, but if you have it configured I\nwould understand the behaviour.  \n\nOf course, the value of showing the Message-Id: in this particular\ncase is dubious (by definition you won't have them on the side that\nyou have not posted), but if you are comparing two iterations that\nhave been queued (e.g. by keeping the old tips of the topic branch\nunpruned by holding onto historical 'origin/pu' using reflog), it\nmay become useful when doing a \"Wait, is that really my bogosity?\nLet's go see the list archive using the message ID---ah, something\nwas suggested in the review and the maintainer attempted to pick it\nup and squash it in, which he botched\".\n"}]}