mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff: add interhunk context config option

Browse Source 
The --inter-hunk-context= option was added in commit 6d0e674a57
("diff: add option to show context between close hunks"). This patch
allows configuring a default for this option.

Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Vegard Nossum
2017-01-12 13:21:11 +01:00
committed by Junio C Hamano
parent d7dffce1ce
commit c488867793
4 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
t/t4032-diff-inter-hunk-context.sh
View File

@ -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