diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-21 23:28:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-21 23:28:31 -0700 |
| commit | e40b34b1ec2c91aaed5572116cd8d01afff7851f (patch) | |
| tree | fe592011faace9f63915472f2ab791ca0428d74a /t/t4013-diff-various.sh | |
| parent | 613e4e5f4046ee36f40199cbaeb9f35442d24378 (diff) | |
| parent | 5adba90d941cdce2aa32ff5b6f562daebef8c2e4 (diff) | |
| download | git-e40b34b1ec2c91aaed5572116cd8d01afff7851f.tar.gz git-e40b34b1ec2c91aaed5572116cd8d01afff7851f.tar.xz | |
Merge branch 'mm/shortopt-detached'
* mm/shortopt-detached:
log: parse separate option for --glob
log: parse separate options like git log --grep foo
diff: parse separate options --stat-width n, --stat-name-width n
diff: split off a function for --stat-* option parsing
diff: parse separate options like -S foo
Conflicts:
revision.c
Diffstat (limited to 't/t4013-diff-various.sh')
| -rwxr-xr-x | t/t4013-diff-various.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index dae635851..19857f432 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -208,6 +208,7 @@ log -p --first-parent master log -m -p --first-parent master log -m -p master log -SF master +log -S F master log -SF -p master log --decorate --all log --decorate=full --all @@ -282,4 +283,8 @@ diff master master^ side diff --dirstat master~1 master~2 EOF +test_expect_success 'log -S requires an argument' ' + test_must_fail git log -S +' + test_done |