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

* kb/tracking-count-no-merges: stat_tracking_info(): only count real commits
git-mirror · Apr 2, 2009 · 988d9fd · 988d9fd
2 parents 0e5e69a + 19de5d6
commit 988d9fd
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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++] = "--";