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.
Junio C Hamano committed
Apr 21, 2009 at 16:32 UTC
8fbf879ed75b67417b0e36eb7b03b79611f1f8a0
2 files changed
+1
-6
Documentation/RelNotes-1.6.3.txt
-4
@@ -69,10 +69,6 @@ Updates since v1.6.2
69
with the 'edit' action in git-add -i/-p, you can abort the editor to
70
tell git not to apply it.
71
72
-* The number of commits shown in "you are ahead/behind your upstream"
73
- messages given by "git checkout" and "git status" used to count merge
74
- commits; now it doesn't.
75
-
72
* @{-1} is a new way to refer to the last branch you were on introduced in
73
1.6.2, but the initial implementation did not teach this to a few
74
commands. Now the syntax works with "branch -m @{-1} newname".
remote.c
+1
-2
@@ -1413,10 +1413,9 @@ int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs)
1413
if (theirs == ours)
1414
return 0;
1415
1416
- /* Run "rev-list --no-merges --left-right ours...theirs" internally... */
1416
+ /* Run "rev-list --left-right ours...theirs" internally... */
1417
rev_argc = 0;
1418
rev_argv[rev_argc++] = NULL;
1419
- rev_argv[rev_argc++] = "--no-merges";
1419
rev_argv[rev_argc++] = "--left-right";
1420
rev_argv[rev_argc++] = symmetric;
1421
rev_argv[rev_argc++] = "--";