summaryrefslogtreecommitdiff
path: root/remote.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-02 05:27:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-02 05:27:43 (GMT)
commit988d9fd8a42b388c30625378dcb521a3b2021b72 (patch)
tree87463803e0bbfe409c4a0735579fa3b00cce991b /remote.c
parent0e5e69a355b7bdd1af6ca33ac7ee35299bda368e (diff)
parent19de5d6913b9681d2bde533bccc8445c9236a648 (diff)
downloadgit-988d9fd8a42b388c30625378dcb521a3b2021b72.zip
git-988d9fd8a42b388c30625378dcb521a3b2021b72.tar.gz
git-988d9fd8a42b388c30625378dcb521a3b2021b72.tar.bz2
Merge branch 'kb/tracking-count-no-merges'
* kb/tracking-count-no-merges: stat_tracking_info(): only count real commits
Diffstat (limited to 'remote.c')
-rw-r--r--remote.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/remote.c b/remote.c
index e5d6b10..2b037f1 100644
--- a/remote.c
+++ b/remote.c
@@ -1401,9 +1401,10 @@ int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs)
if (theirs == ours)
return 0;
- /* Run "rev-list --left-right ours...theirs" internally... */
+ /* Run "rev-list --no-merges --left-right ours...theirs" internally... */
rev_argc = 0;
rev_argv[rev_argc++] = NULL;
+ rev_argv[rev_argc++] = "--no-merges";
rev_argv[rev_argc++] = "--left-right";
rev_argv[rev_argc++] = symmetric;
rev_argv[rev_argc++] = "--";