Avoid invoking diff drivers during git-stash

diff --git a/log-tree.c b/log-tree.c
index a6423718e76be34e62bc76dcf3c93b32e38aa152..b509c0c7ec239d4f426807406d94c34feeecf009 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -321,7 +321,8 @@ int log_tree_diff_flush(struct rev_info *opt)
                 * output for readability.
                 */
                show_log(opt, opt->diffopt.msg_sep);
-               if (opt->verbose_header &&
+               if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) &&
+                   opt->verbose_header &&
                    opt->commit_format != CMIT_FMT_ONELINE) {
                        int pch = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
                        if ((pch & opt->diffopt.output_format) == pch)