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

Merge branch 'mm/maint-log-n-with-diff-filtering'

Browse Source 
* mm/maint-log-n-with-diff-filtering:
  log: fix --max-count when used together with -S or -G
This commit is contained in:
Junio C Hamano 2011-03-19 23:25:38 -07:00
commit a91df69cbb
5 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/log.c
View File

@ -263,7 +263,13 @@ static int cmd_log_walk(struct rev_info *rev)
* retain that state information if replacing rev->diffopt in this loop
*/
while ((commit = get_revision(rev)) != NULL) {
log_tree_commit(rev, commit);
if (!log_tree_commit(rev, commit) &&
rev->max_count >= 0)
/*
* We decremented max_count in get_revision,
* but we didn't actually show the commit.
*/
rev->max_count++;
if (!rev->reflog_info) {
/* we allow cycles in reflog ancestry */
free(commit->buffer);

3
t/t4013-diff-various.sh
View File

@ -210,6 +210,9 @@ log -m -p master
log -SF master
log -S F master
log -SF -p master
log -SF master --max-count=0
log -SF master --max-count=1
log -SF master --max-count=2
log -GF master
log -GF -p master
log -GF -p --pickaxe-all master

2
t/t4013/diff.log_-SF_master_--max-count=0 Normal file
View File

@ -0,0 +1,2 @@
$ git log -SF master --max-count=0
$

7
t/t4013/diff.log_-SF_master_--max-count=1 Normal file
View File

@ -0,0 +1,7 @@
$ git log -SF master --max-count=1
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000
Third
$

7
t/t4013/diff.log_-SF_master_--max-count=2 Normal file
View File

@ -0,0 +1,7 @@
$ git log -SF master --max-count=2
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:02:00 2006 +0000
Third
$