Merge branch 'jc/fetch-sorted' into next

diff --git a/diff-tree.c b/diff-tree.c
index 979f792b6758101cb490f36ba3acff5d7d4b4473..69bb74b3100d598c938fa01f1111deb85abcfac0 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -69,7 +69,9 @@ int main(int argc, const char **argv)
 
        git_config(git_diff_config);
        nr_sha1 = 0;
+       init_revisions(opt);
        opt->abbrev = 0;
+       opt->diff = 1;
        argc = setup_revisions(argc, argv, opt, NULL);
 
        while (--argc > 0) {
@@ -136,7 +138,10 @@ int main(int argc, const char **argv)
                opt->diffopt.setup |= (DIFF_SETUP_USE_SIZE_CACHE |
                                       DIFF_SETUP_USE_CACHE);
        while (fgets(line, sizeof(line), stdin))
-               diff_tree_stdin(line);
+               if (line[0] == '\n')
+                       fflush(stdout);
+               else
+                       diff_tree_stdin(line);
 
        return 0;
 }