diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-23 23:59:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-23 23:59:21 (GMT) |
| commit | 8ec68d1ae2863823b74d67c5e92297e38bbf97bc (patch) | |
| tree | d3136e669a64ea0c2ebefe7e2a000493bf8ee580 /t | |
| parent | e801be066cc12799cd053a5b4eb792d9007133fc (diff) | |
| parent | c488867793dc9b273c1d35746452d44afcd3d7f5 (diff) | |
| download | git-8ec68d1ae2863823b74d67c5e92297e38bbf97bc.zip git-8ec68d1ae2863823b74d67c5e92297e38bbf97bc.tar.gz git-8ec68d1ae2863823b74d67c5e92297e38bbf97bc.tar.bz2 | |
Merge branch 'vn/diff-ihc-config'
"git diff" learned diff.interHunkContext configuration variable
that gives the default value for its --inter-hunk-context option.
* vn/diff-ihc-config:
diff: add interhunk context config option
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4032-diff-inter-hunk-context.sh | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/t/t4032-diff-inter-hunk-context.sh b/t/t4032-diff-inter-hunk-context.sh index e4e3e28..bada0cb 100755 --- a/t/t4032-diff-inter-hunk-context.sh +++ b/t/t4032-diff-inter-hunk-context.sh @@ -16,11 +16,15 @@ f() { } t() { + use_config= + git config --unset diff.interHunkContext + case $# in 4) hunks=$4; cmd="diff -U$3";; 5) hunks=$5; cmd="diff -U$3 --inter-hunk-context=$4";; + 6) hunks=$5; cmd="diff -U$3"; git config diff.interHunkContext $4; use_config="(diff.interHunkContext=$4) ";; esac - label="$cmd, $1 common $2" + label="$use_config$cmd, $1 common $2" file=f$1 expected=expected.$file.$3.$hunks @@ -89,4 +93,25 @@ t 9 lines 3 2 t 9 lines 3 2 2 t 9 lines 3 3 1 +# use diff.interHunkContext? +t 1 line 0 0 2 config +t 1 line 0 1 1 config +t 1 line 0 2 1 config +t 9 lines 3 3 1 config +t 2 lines 0 0 2 config +t 2 lines 0 1 2 config +t 2 lines 0 2 1 config +t 3 lines 1 0 2 config +t 3 lines 1 1 1 config +t 3 lines 1 2 1 config +t 9 lines 3 2 2 config +t 9 lines 3 3 1 config + +test_expect_success 'diff.interHunkContext invalid' ' + git config diff.interHunkContext asdf && + test_must_fail git diff && + git config diff.interHunkContext -1 && + test_must_fail git diff +' + test_done |