Merge branch 'kb/tracking-count-no-merges'

* kb/tracking-count-no-merges:
stat_tracking_info(): only count real commits

diff --git a/remote.c b/remote.c
index e5d6b100d738c388bff91bff68b14f69dea87166..2b037f11b29d86e38d6608a58c65e79e0ffd3800 100644 (file)
--- 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++] = "--";