pull --rebase: exit early when the working directory is dirty

diff --git a/builtin-diff-tree.c b/builtin-diff-tree.c
index 2e13716eec985e7274d6f44646c94d8224964b7c..832797ff3bb45751758f0d629abb2cf8fa4507ad 100644 (file)
--- a/builtin-diff-tree.c
+++ b/builtin-diff-tree.c
@@ -68,7 +68,7 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
        int read_stdin = 0;
 
        init_revisions(opt, prefix);
-       git_config(git_default_config); /* no "diff" UI options */
+       git_config(git_diff_basic_config); /* no "diff" UI options */
        nr_sha1 = 0;
        opt->abbrev = 0;
        opt->diff = 1;
@@ -117,23 +117,21 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
                break;
        }
 
-       if (!read_stdin)
-               return DIFF_OPT_TST(&opt->diffopt, EXIT_WITH_STATUS)
-                       && DIFF_OPT_TST(&opt->diffopt, HAS_CHANGES);
+       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 DIFF_OPT_TST(&opt->diffopt, EXIT_WITH_STATUS)
-               && DIFF_OPT_TST(&opt->diffopt, HAS_CHANGES);
+
+       return diff_result_code(&opt->diffopt, 0);
 }