diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-24 01:37:47 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-24 01:37:47 +0200 |
| commit | 9ab55bd29a9f110810b72d82be912380f74051b3 (patch) | |
| tree | 9eaedc8cfc9a4654ac4d51de9482fc32ccb646cf /diff-tree.c | |
| parent | git-apply: unknown modes are zero, not -1 (diff) | |
| download | git-9ab55bd29a9f110810b72d82be912380f74051b3.tar.xz git-9ab55bd29a9f110810b72d82be912380f74051b3.zip | |
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.
Diffstat (limited to 'diff-tree.c')
| -rw-r--r-- | diff-tree.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/diff-tree.c b/diff-tree.c index 0d21b18ff7..31f8019046 100644 --- a/diff-tree.c +++ b/diff-tree.c @@ -267,12 +267,12 @@ static int call_diff_flush(void) if (detect_rename) diffcore_rename(detect_rename, diff_score_opt); diffcore_prune(); - if (pickaxe) { + if (pickaxe) diffcore_pickaxe(pickaxe); - if (diff_queue_is_empty()) { - diff_flush(DIFF_FORMAT_NO_OUTPUT, 0); - return 0; - } + + if (diff_queue_is_empty()) { + diff_flush(DIFF_FORMAT_NO_OUTPUT, 0); + return 0; } if (nr_paths) diffcore_pathspec(paths); |