diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-05-30 20:50:44 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-30 20:50:44 +0300 |
| commit | 20aa7c594fbc2e36476daae2f53d7c020306c62c (patch) | |
| tree | 16594455c941e4bc0002e32a624d27a29b0caeed /t/t4013-diff-various.sh | |
| parent | aa25c82427ae70aebf3b8f970f2afd54e9a2a8c6 (diff) | |
| parent | f7e68a08780e91d7c2f830f33457041407172b96 (diff) | |
Merge branch 'nd/diff-parseopt'
A brown-paper-bag bugfix to a change already in 'master'.
* nd/diff-parseopt:
parse-options: check empty value in OPT_INTEGER and OPT_ABBREV
diff-parseopt: restore -U (no argument) behavior
diff-parseopt: correct variable types that are used by parseopt
Diffstat (limited to 't/t4013-diff-various.sh')
| -rwxr-xr-x | t/t4013-diff-various.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 9f8f0e84ad..a9054d2db1 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -338,6 +338,8 @@ format-patch --inline --stdout initial..master^^ format-patch --stdout --cover-letter -n initial..master^ diff --abbrev initial..side +diff -U initial..side +diff -U1 initial..side diff -r initial..side diff --stat initial..side diff -r --stat initial..side |