undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'kb/tracking-count-no-merges'

Browse Source 
* kb/tracking-count-no-merges:
  stat_tracking_info(): only count real commits
This commit is contained in:
Junio C Hamano 2009-04-01 22:27:43 -07:00
commit 988d9fd8a4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
remote.c
View File

@ -1401,9 +1401,10 @@ int stat_tracking_info(struct branch *branch, int *num_ours, int *num_theirs)
if (theirs == ours) if (theirs == ours)
return 0; return 0;
/* Run "rev-list --left-right ours...theirs" internally... */ /* Run "rev-list --no-merges --left-right ours...theirs" internally... */
rev_argc = 0; rev_argc = 0;
rev_argv[rev_argc++] = NULL; rev_argv[rev_argc++] = NULL;
rev_argv[rev_argc++] = "--no-merges";
rev_argv[rev_argc++] = "--left-right"; rev_argv[rev_argc++] = "--left-right";
rev_argv[rev_argc++] = symmetric; rev_argv[rev_argc++] = symmetric;
rev_argv[rev_argc++] = "--"; rev_argv[rev_argc++] = "--";