#!/bin/sh setvar test_description = ''diff hunk fusing'' source ./test-lib.sh proc f { echo $1 setvar i = '1' while test $i -le $2 { echo $i setvar i = $(expr $i + 1) } echo $3 } proc t { case (#) { 4 { setvar hunks = "$4"; setvar cmd = ""diff -U$3""} 5 { setvar hunks = "$5"; setvar cmd = ""diff -U$3 --inter-hunk-context=$4""} } setvar label = ""$cmd, $1 common $2"" setvar file = "f$1" setvar expected = "expected.$file.$3.$hunks" if ! test -f $file { f A $1 B >$file git add $file git commit -q -m. $file f X $1 Y >$file } test_expect_success "$label: count hunks ($hunks)" " test $(git $cmd $file | grep '^@@ ' | wc -l) = $hunks " test -f $expected && test_expect_success "$label: check output" " git $cmd $file | grep -v '^index ' >actual && test_cmp $expected actual " } cat <<< """ >expected.f1.0.1 || exit 1 diff --git a/f1 b/f1 --- a/f1 +++ b/f1 @@ -1,3 +1,3 @@ -A +X 1 -B +Y """ >expected.f1.0.1 || exit 1 diff --git a/f1 b/f1 --- a/f1 +++ b/f1 @@ -1,3 +1,3 @@ -A +X 1 -B +Y EOF cat <<< """ >expected.f1.0.2 || exit 1 diff --git a/f1 b/f1 --- a/f1 +++ b/f1 @@ -1 +1 @@ -A +X @@ -3 +3 @@ A -B +Y """ >expected.f1.0.2 || exit 1 diff --git a/f1 b/f1 --- a/f1 +++ b/f1 @@ -1 +1 @@ -A +X @@ -3 +3 @@ A -B +Y EOF # common lines ctx intrctx hunks t 1 line 0 2 t 1 line 0 0 2 t 1 line 0 1 1 t 1 line 0 2 1 t 1 line 1 1 t 2 lines 0 2 t 2 lines 0 0 2 t 2 lines 0 1 2 t 2 lines 0 2 1 t 2 lines 1 1 t 3 lines 1 2 t 3 lines 1 0 2 t 3 lines 1 1 1 t 3 lines 1 2 1 t 9 lines 3 2 t 9 lines 3 2 2 t 9 lines 3 3 1 test_done