diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-01-17 14:49:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-17 14:49:30 -0800 |
| commit | 28c8a447dd4d6420fc08106efa1c288246b15845 (patch) | |
| tree | c1c40e1070da9044ca23ab7250ce1d6be868949b /t/t4013-diff-various.sh | |
| parent | Merge branch 'jk/stash-disable-renames-internally' into maint (diff) | |
| parent | diff: handle --no-abbrev in no-index case (diff) | |
| download | tgif-28c8a447dd4d6420fc08106efa1c288246b15845.tar.xz | |
Merge branch 'jb/diff-no-index-no-abbrev' into maint
"git diff --no-index" did not take "--no-abbrev" option.
* jb/diff-no-index-no-abbrev:
diff: handle --no-abbrev in no-index case
Diffstat (limited to 't/t4013-diff-various.sh')
| -rwxr-xr-x | t/t4013-diff-various.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 566817e2ef..d09acfe48e 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -311,6 +311,13 @@ diff --line-prefix=abc master master^ side diff --dirstat master~1 master~2 diff --dirstat initial rearrange diff --dirstat-by-file initial rearrange +# No-index --abbrev and --no-abbrev +diff --raw initial +diff --raw --abbrev=4 initial +diff --raw --no-abbrev initial +diff --no-index --raw dir2 dir +diff --no-index --raw --abbrev=4 dir2 dir +diff --no-index --raw --no-abbrev dir2 dir EOF test_expect_success 'log -S requires an argument' ' |