]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'tb/diff-tree-with-notes'
authorJunio C Hamano <gitster@pobox.com>
Tue, 28 Apr 2020 22:50:07 +0000 (15:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Apr 2020 22:50:07 +0000 (15:50 -0700)
"git diff-tree --pretty --notes" used to hit an assertion failure,
as it forgot to initialize the notes subsystem.

* tb/diff-tree-with-notes:
  diff-tree.c: load notes machinery when required

1  2 
t/t4013-diff-various.sh

Simple merge