From 8fbf879ed75b67417b0e36eb7b03b79611f1f8a0 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 21 Apr 2009 16:32:18 -0700 Subject: Revert "stat_tracking_info(): only count real commits" This reverts commit 19de5d6913b9681d2bde533bccc8445c9236a648. It produces a misleading output to decide if a merge can fast-forward. --- remote.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'remote.c') diff --git a/remote.c b/remote.c index 41c5b59736..91f748550e 100644 --- a/remote.c +++ b/remote.c @@ -1413,10 +1413,9 @@ int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs) if (theirs == ours) return 0; - /* Run "rev-list --no-merges --left-right ours...theirs" internally... */ + /* Run "rev-list --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++] = "--"; -- cgit v1.2.1