Browse Source

diff-tree: don't write headers if the diff queue is empty

This is not a pickaxe-specific thing, we do this regardless of
what has pruned down the diff queue.
maint
Linus Torvalds 20 years ago
parent
commit
9ab55bd29a
  1. 10
      diff-tree.c

10
diff-tree.c

@ -267,12 +267,12 @@ static int call_diff_flush(void)
if (detect_rename) if (detect_rename)
diffcore_rename(detect_rename, diff_score_opt); diffcore_rename(detect_rename, diff_score_opt);
diffcore_prune(); diffcore_prune();
if (pickaxe) { if (pickaxe)
diffcore_pickaxe(pickaxe); diffcore_pickaxe(pickaxe);
if (diff_queue_is_empty()) {
diff_flush(DIFF_FORMAT_NO_OUTPUT, 0); if (diff_queue_is_empty()) {
return 0; diff_flush(DIFF_FORMAT_NO_OUTPUT, 0);
} return 0;
} }
if (nr_paths) if (nr_paths)
diffcore_pathspec(paths); diffcore_pathspec(paths);

Loading…
Cancel
Save