diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-04-21 16:32:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-21 16:33:20 -0700 |
| commit | 8fbf879ed75b67417b0e36eb7b03b79611f1f8a0 (patch) | |
| tree | 268336d6e6f2d068cb4f24ffc88d15490c8f68fe /remote.c | |
| parent | 3a0483281afbb6660aaf86c7b228a523782a4d6a (diff) | |
| download | git-8fbf879ed75b67417b0e36eb7b03b79611f1f8a0.tar.gz git-8fbf879ed75b67417b0e36eb7b03b79611f1f8a0.tar.xz | |
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.
Diffstat (limited to 'remote.c')
| -rw-r--r-- | remote.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -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++] = "--"; |