summaryrefslogtreecommitdiff
path: root/t/t4032-diff-inter-hunk-context.sh
diff options
context:
space:
mode:
authorVegard Nossum <vegard.nossum@oracle.com>2017-01-12 12:21:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-01-12 20:55:43 (GMT)
commitc488867793dc9b273c1d35746452d44afcd3d7f5 (patch)
tree2aaada4e2834794bd322cc698c5c9856564ad3bf /t/t4032-diff-inter-hunk-context.sh
parentd7dffce1cebde29a0c4b309a79e4345450bf352a (diff)
downloadgit-c488867793dc9b273c1d35746452d44afcd3d7f5.zip
git-c488867793dc9b273c1d35746452d44afcd3d7f5.tar.gz
git-c488867793dc9b273c1d35746452d44afcd3d7f5.tar.bz2
diff: add interhunk context config option
The --inter-hunk-context= option was added in commit 6d0e674a5754 ("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>
Diffstat (limited to 't/t4032-diff-inter-hunk-context.sh')
-rwxr-xr-xt/t4032-diff-inter-hunk-context.sh27
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