mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tr/rev-list-count'

Browse Source 
* tr/rev-list-count:
  bash completion: Support "divergence from upstream" messages in __git_ps1
  rev-list: introduce --count option

Conflicts:
	contrib/completion/git-completion.bash
This commit is contained in:
Junio C Hamano
2010-06-30 11:55:38 -07:00
parent 304d8b6256 6d158cba28
commit 6296062285
6 changed files with 204 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
builtin/rev-list.c
View File

@ -50,6 +50,15 @@ static void show_commit(struct commit *commit, void *data)
graph_show_commit(revs->graph);
if (revs->count) {
if (commit->object.flags & SYMMETRIC_LEFT)
revs->count_left++;
else
revs->count_right++;
finish_commit(commit, data);
return;
}
if (info->show_timestamp)
printf("%lu ", commit->date);
if (info->header_prefix)
@ -400,5 +409,12 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
quiet ? finish_object : show_object,
&info);
if (revs.count) {
if (revs.left_right)
printf("%d\t%d\n", revs.count_left, revs.count_right);
else
printf("%d\n", revs.count_left + revs.count_right);
}
return 0;
}