Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
diff-tree: don't write headers if the diff queue is empty
author
Linus Torvalds
<torvalds@ppc970.osdl.org>
Mon, 23 May 2005 23:37:47 +0000
(16:37 -0700)
committer
Linus Torvalds
<torvalds@ppc970.osdl.org>
Mon, 23 May 2005 23:37:47 +0000
(16:37 -0700)
This is not a pickaxe-specific thing, we do this regardless of
what has pruned down the diff queue.
diff-tree.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
881b076
)
diff --git
a/diff-tree.c
b/diff-tree.c
index 0d21b18ff700a37509dfb9bd57f2fa636840cb5c..31f8019046f8ee24812ef57702d1484f5b563992 100644
(file)
--- 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);