summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-29 10:28:25 -0700
committerJunio C Hamano <gitster@pobox.com>2009-06-29 12:32:51 -0700
commitb8e8db281cea9641253233a2bf8d01ab1f908abe (patch)
tree70f88a15d03585f1f50964789874f98ce3110dab
parent4f2b15ce88b70dd9e269517a9903864393ca873b (diff)
downloadgit-b8e8db281cea9641253233a2bf8d01ab1f908abe.tar.gz
git log: add '--merges' flag to match '--no-merges'
I do various statistics on git, and one of the things I look at is merges, because they are often interesting events to count ("how many merges vs how much 'real development'" kind of statistics). And you can do it with some fairly straightforward scripting, ie git rev-list --parents HEAD | grep ' .* ' | git diff-tree --always -s --pretty=oneline --stdin | less -S will do it. But I finally got irritated with the fact that we can skip merges with '--no-merges', but we can't do the trivial reverse operation. So this just adds a '--merges' flag that _only_ shows merges. Now you can do the above with just a git log --merges --pretty=oneline which is a lot simpler. It also means that we automatically get a lot of statistics for free, eg git shortlog -ns --merges does exactly what you'd want it to do. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--revision.c4
-rw-r--r--revision.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/revision.c b/revision.c
index bf58448367..a31434bdc8 100644
--- a/revision.c
+++ b/revision.c
@@ -1077,6 +1077,8 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
revs->show_all = 1;
} else if (!strcmp(arg, "--remove-empty")) {
revs->remove_empty_trees = 1;
+ } else if (!strcmp(arg, "--merges")) {
+ revs->merges_only = 1;
} else if (!strcmp(arg, "--no-merges")) {
revs->no_merges = 1;
} else if (!strcmp(arg, "--boundary")) {
@@ -1676,6 +1678,8 @@ enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
return commit_ignore;
if (revs->no_merges && commit->parents && commit->parents->next)
return commit_ignore;
+ if (revs->merges_only && !(commit->parents && commit->parents->next))
+ return commit_ignore;
if (!commit_match(commit, revs))
return commit_ignore;
if (revs->prune && revs->dense) {
diff --git a/revision.h b/revision.h
index 227164cf70..fb74492714 100644
--- a/revision.h
+++ b/revision.h
@@ -36,6 +36,7 @@ struct rev_info {
unsigned int dense:1,
prune:1,
no_merges:1,
+ merges_only:1,
no_walk:1,
show_all:1,
remove_empty_trees:1,