aboutsummaryrefslogtreecommitdiffstats
path: root/log-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-04-28 10:46:04 -0700
committerJunio C Hamano <gitster@pobox.com>2022-04-28 10:46:04 -0700
commit3da993f2e63864668ca7ae1a91c351684aec319d (patch)
treec9fa6b5145e6f5918d79eb3e51f14bf344402164 /log-tree.c
parent740deeadd3d2c10b8a98573fdf65aa433a0bf816 (diff)
parentf8781bfda31756acdc0ae77da7e70337aedae7c9 (diff)
downloadgit-3da993f2e63864668ca7ae1a91c351684aec319d.tar.gz
Merge branch 'jc/diff-tree-stdin-fix'
"diff-tree --stdin" has been broken for about a year, but 2.36 release broke it even worse by breaking running the command with <pathspec>, which in turn broke "gitk" and got noticed. This has been corrected by aligning its behaviour to that of "log". * jc/diff-tree-stdin-fix: 2.36 gitk/diff-tree --stdin regression fix
Diffstat (limited to 'log-tree.c')
-rw-r--r--log-tree.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/log-tree.c b/log-tree.c
index 38e5cccc1a..3a03e34c30 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -1098,6 +1098,7 @@ int log_tree_commit(struct rev_info *opt, struct commit *commit)
opt->loginfo = &log;
opt->diffopt.no_free = 1;
+ /* NEEDSWORK: no restoring of no_free? Why? */
if (opt->line_level_traverse)
return line_log_print(opt, commit);