--name-only, --name-status, --check and -s are mutually exclusive

diff --git a/combine-diff.c b/combine-diff.c
index 7178b25c53551271f869e182611bb1c705c0de76..2fd0ced3957a41d8c383b2487ddfdea77d1b3985 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -841,7 +841,7 @@ void diff_tree_combined(const unsigned char *sha1,
        diffopts.output_format = DIFF_FORMAT_NO_OUTPUT;
        diffopts.recursive = 1;
 
-       show_log_first = rev->loginfo;
+       show_log_first = !!rev->loginfo;
        needsep = 0;
        /* find set of paths that everybody touches */
        for (i = 0; i < num_parent; i++) {