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 /builtin | |
| 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 'builtin')
| -rw-r--r-- | builtin/diff-tree.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c index cb9ea79367..802363d0a2 100644 --- a/builtin/diff-tree.c +++ b/builtin/diff-tree.c @@ -109,6 +109,7 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix) struct object *tree1, *tree2; static struct rev_info *opt = &log_tree_opt; struct setup_revision_opt s_r_opt; + struct userformat_want w; int read_stdin = 0; if (argc == 2 && !strcmp(argv[1], "-h")) @@ -127,6 +128,14 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix) precompose_argv(argc, argv); argc = setup_revisions(argc, argv, opt, &s_r_opt); + memset(&w, 0, sizeof(w)); + userformat_find_requirements(NULL, &w); + + if (!opt->show_notes_given && w.notes) + opt->show_notes = 1; + if (opt->show_notes) + load_display_notes(&opt->notes_opt); + while (--argc > 0) { const char *arg = *++argv; |