diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-04-28 15:50:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-28 15:50:07 -0700 |
| commit | 5a96715eb7451e81b3d981f2b4797a1aa4f1afdd (patch) | |
| tree | fecff1f6dda9ba7222ac0691744b1a083bb63b04 /t/t4013/diff.diff-tree_--format=%N_note | |
| parent | Merge branch 'eb/mboxrd-doc' (diff) | |
| parent | diff-tree.c: load notes machinery when required (diff) | |
| download | tgif-5a96715eb7451e81b3d981f2b4797a1aa4f1afdd.tar.xz | |
Merge branch 'tb/diff-tree-with-notes'
"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
Diffstat (limited to 't/t4013/diff.diff-tree_--format=%N_note')
| -rw-r--r-- | t/t4013/diff.diff-tree_--format=%N_note | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t4013/diff.diff-tree_--format=%N_note b/t/t4013/diff.diff-tree_--format=%N_note new file mode 100644 index 0000000000..93042ed539 --- /dev/null +++ b/t/t4013/diff.diff-tree_--format=%N_note @@ -0,0 +1,6 @@ +$ git diff-tree --format=%N note +note + + +:100644 100755 01e79c32a8c99c557f0757da7cb6d65b3414466d 01e79c32a8c99c557f0757da7cb6d65b3414466d M file2 +$ |