branch.autosetupmerge: allow boolean values, or "all"

diff --git a/log-tree.c b/log-tree.c
index 0cf21bc05180b577a5f14dc57031c260e7c44334..8624d5a39ca3119fe7c4204a2c3b1f272a4b609d 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -200,7 +200,7 @@ void show_log(struct rev_info *opt, const char *sep)
                                        digits_in_number(opt->total),
                                        opt->nr, opt->total);
                        subject = buffer;
-               } else if (opt->total == 0) {
+               } else if (opt->total == 0 && opt->subject_prefix && *opt->subject_prefix) {
                        static char buffer[256];
                        snprintf(buffer, sizeof(buffer),
                                        "Subject: [%s] ",
@@ -408,5 +408,6 @@ int log_tree_commit(struct rev_info *opt, struct commit *commit)
                shown = 1;
        }
        opt->loginfo = NULL;
+       maybe_flush_or_die(stdout, "stdout");
        return shown;
 }