Merge branch 'ar/commit-cleanup'

diff --git a/builtin-diff-tree.c b/builtin-diff-tree.c
index 0b591c87169ff4b8c2173bedb26d6ed1a8a84b68..ebc50efbd22f7fa294d66d73d7b2c3084931b4b7 100644 (file)
--- a/builtin-diff-tree.c
+++ b/builtin-diff-tree.c
@@ -117,22 +117,21 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
                break;
        }
 
-       if (!read_stdin)
-               return opt->diffopt.exit_with_status ?
-                   opt->diffopt.has_changes: 0;
+       if (read_stdin) {
+               if (opt->diffopt.detect_rename)
+                       opt->diffopt.setup |= (DIFF_SETUP_USE_SIZE_CACHE |
+                                              DIFF_SETUP_USE_CACHE);
+               while (fgets(line, sizeof(line), stdin)) {
+                       unsigned char sha1[20];
 
-       if (opt->diffopt.detect_rename)
-               opt->diffopt.setup |= (DIFF_SETUP_USE_SIZE_CACHE |
-                                      DIFF_SETUP_USE_CACHE);
-       while (fgets(line, sizeof(line), stdin)) {
-               unsigned char sha1[20];
-
-               if (get_sha1_hex(line, sha1)) {
-                       fputs(line, stdout);
-                       fflush(stdout);
+                       if (get_sha1_hex(line, sha1)) {
+                               fputs(line, stdout);
+                               fflush(stdout);
+                       }
+                       else
+                               diff_tree_stdin(line);
                }
-               else
-                       diff_tree_stdin(line);
        }
-       return opt->diffopt.exit_with_status ? opt->diffopt.has_changes: 0;
+
+       return diff_result_code(&opt->diffopt, 0);
 }