From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Apr 2009 23:32:18 +0000 (-0700)
Subject: Revert "stat_tracking_info(): only count real commits"
X-Git-Tag: v1.6.3-rc2~25
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8fbf879ed75b67417b0e36eb7b03b79611f1f8a0;p=git.git

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.
---

diff --git a/Documentation/RelNotes-1.6.3.txt b/Documentation/RelNotes-1.6.3.txt
index b53e7b86e..efce29ddf 100644
--- a/Documentation/RelNotes-1.6.3.txt
+++ b/Documentation/RelNotes-1.6.3.txt
@@ -69,10 +69,6 @@ Updates since v1.6.2
   with the 'edit' action in git-add -i/-p, you can abort the editor to
   tell git not to apply it.
 
-* The number of commits shown in "you are ahead/behind your upstream"
-  messages given by "git checkout" and "git status" used to count merge
-  commits; now it doesn't.
-
 * @{-1} is a new way to refer to the last branch you were on introduced in
   1.6.2, but the initial implementation did not teach this to a few
   commands.  Now the syntax works with "branch -m @{-1} newname".
diff --git a/remote.c b/remote.c
index 41c5b5973..91f748550 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++] = "--";