diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-04-03 12:31:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-03 12:31:59 -0700 |
| commit | 1030536153db404daba4a140d1e3fa1a7ba470a5 (patch) | |
| tree | 7884237494bd5202639c72dc8080f03baab35cb9 /t/t4013 | |
| parent | Merge branch 'jk/format-patch-multiline-header' into maint (diff) | |
| parent | log: fix --max-count when used together with -S or -G (diff) | |
| download | tgif-1030536153db404daba4a140d1e3fa1a7ba470a5.tar.xz | |
Merge branch 'mm/maint-log-n-with-diff-filtering' into maint
* mm/maint-log-n-with-diff-filtering:
log: fix --max-count when used together with -S or -G
Diffstat (limited to 't/t4013')
| -rw-r--r-- | t/t4013/diff.log_-SF_master_--max-count=0 | 2 | ||||
| -rw-r--r-- | t/t4013/diff.log_-SF_master_--max-count=1 | 7 | ||||
| -rw-r--r-- | t/t4013/diff.log_-SF_master_--max-count=2 | 7 |
3 files changed, 16 insertions, 0 deletions
diff --git a/t/t4013/diff.log_-SF_master_--max-count=0 b/t/t4013/diff.log_-SF_master_--max-count=0 new file mode 100644 index 0000000000..c1fc6c8731 --- /dev/null +++ b/t/t4013/diff.log_-SF_master_--max-count=0 @@ -0,0 +1,2 @@ +$ git log -SF master --max-count=0 +$ diff --git a/t/t4013/diff.log_-SF_master_--max-count=1 b/t/t4013/diff.log_-SF_master_--max-count=1 new file mode 100644 index 0000000000..c981a03814 --- /dev/null +++ b/t/t4013/diff.log_-SF_master_--max-count=1 @@ -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 +$ diff --git a/t/t4013/diff.log_-SF_master_--max-count=2 b/t/t4013/diff.log_-SF_master_--max-count=2 new file mode 100644 index 0000000000..a6c55fd482 --- /dev/null +++ b/t/t4013/diff.log_-SF_master_--max-count=2 @@ -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 +$ |