Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'master' into next
author
Junio C Hamano
<junkio@cox.net>
Wed, 24 May 2006 10:32:31 +0000
(
03:32
-0700)
committer
Junio C Hamano
<junkio@cox.net>
Wed, 24 May 2006 10:32:31 +0000
(
03:32
-0700)
* master:
--summary output should print immediately after stats.
git-svn: ignore expansion of svn:keywords
git-svn: starting a 1.1.0-pre development version
cvsimport: set up commit environment in perl instead of using env
1
2
diff.c
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
17cf392
fad7068
)
diff --cc
diff.c
index a7bb9b95bd841a581d8d47d86b96b7140e9b8133,77c09a87b0742376784d2563221763ffd4c6934e..9e9cfc8b75b7b761980b0d32cb0c516ea3505ba3
---
1
/
diff.c
---
2
/
diff.c
+++ b/
diff.c
@@@
-1989,10
-1988,10
+1989,13
@@@
void diff_flush(struct diff_options *op
show_stats(diffstat);
free(diffstat);
diffstat = NULL;
- putchar(options->line_termination);
+ if (options->summary)
+ for (i = 0; i < q->nr; i++)
+ diff_summary(q->queue[i]);
+ if (options->stat_sep)
+ fputs(options->stat_sep, stdout);
+ else
+ putchar(options->line_termination);
}
for (i = 0; i < q->nr; i++) {
struct diff_filepair *p = q->queue[i];