git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Question on range-diff and notes.displayref

From
Elijah Newren <newren@gmail.com>
Date
Jul 31, 2018, 17:19 UTC
Message-ID
<CABPp-BH+YW6z147K-X7eTH2E9A3tUzteosKA1KadhSavM5c8Lg@mail.gmail.com>
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:
Show 16 quoted lines
> 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?

Elijah
Next: Junio C Hamano
Message 1 of 2 in “Question on range-diff and notes.displayref”
  1. Elijah NewrenJul 31, 2018
  2. Junio C HamanoJul 31, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.