]> git.ipfire.org Git - thirdparty/git.git/commit - t/t4013/diff.log_--decorate_--all
diff-tree.c: load notes machinery when required
authorTaylor Blau <me@ttaylorr.com>
Tue, 21 Apr 2020 00:13:15 +0000 (18:13 -0600)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Apr 2020 01:22:54 +0000 (18:22 -0700)
commit5778b22b3d690495e724276663c36ccd5329da4d
treeb4fbd8c90f8439b75fe90e9d834fcb4c3f6c7848
parentd0654dc308b0ba76dd8ed7bbb33c8d8f7aacd783
diff-tree.c: load notes machinery when required

Since its introduction in 7249e91 (revision.c: support --notes
command-line option, 2011-03-29), combining '--notes' with any option
that causes us to format notes (e.g., '--pretty', '--format="%N"', etc)
results in a failed assertion at runtime.

  $ git rev-list HEAD | git diff-tree --stdin --pretty=medium --notes
  commit 8f3d9f354286745c751374f5f1fcafee6b3f3136
  git: notes.c:1308: format_display_notes: Assertion `display_notes_trees' failed.
  Aborted

This failure is due to diff-tree not calling 'load_display_notes' to
initialize the notes machinery.

Ordinarily, this failure isn't triggered, because it requires passing
both '--notes' and another of the above mentioned options. In the case
of '--pretty', for example, we set 'opt->verbose_header', causing
'show_log()' to eventually call 'format_display_notes()', which expects
a non-NULL 'display_note_trees'.

Without initializing the notes machinery, 'display_note_trees' remains
NULL, and thus triggers an assertion failure.

Fix this by initializing the notes machinery after parsing our options,
and harden this behavior against regression with a test in t4013. (Note
that the added ref in this test requires updating two unrelated tests
which use 'log --all', and thus need to learn about the new refs).

Reported-by: Jeff King <peff@peff.net>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/diff-tree.c
t/t4013-diff-various.sh
t/t4013/diff.diff-tree_--format=%N_note [new file with mode: 0644]
t/t4013/diff.diff-tree_--pretty_--notes_note [new file with mode: 0644]
t/t4013/diff.diff-tree_--pretty_note [new file with mode: 0644]
t/t4013/diff.log_--decorate=full_--all
t/t4013/diff.log_--decorate_--all