Merge branch 'mg/tracked-local-branches'

diff --git a/remote.c b/remote.c
index 30d7fdec834cc0dcc35d335754add91f96b51ab3..d12140e0fef5331188295da1f3190873ddc5bed8 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -1402,9 +1402,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++] = "--";