t4029: abstract away SHA-1-specific constants
Adjust the test so that it computes variables for blobs instead of using hard-coded hashes. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
7022ba336d
commit
b55ee57277
@ -6,7 +6,7 @@ test_description='diff honors config option, diff.suppressBlankEmpty'
|
|||||||
|
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
|
|
||||||
cat <<\EOF > exp ||
|
cat <<\EOF >expected ||
|
||||||
diff --git a/f b/f
|
diff --git a/f b/f
|
||||||
index 5f6a263..8cb8bae 100644
|
index 5f6a263..8cb8bae 100644
|
||||||
--- a/f
|
--- a/f
|
||||||
@ -20,9 +20,14 @@ exit 1
|
|||||||
|
|
||||||
test_expect_success "$test_description" '
|
test_expect_success "$test_description" '
|
||||||
printf "\nx\n" > f &&
|
printf "\nx\n" > f &&
|
||||||
|
before=$(git hash-object f) &&
|
||||||
|
before=$(git rev-parse --short $before) &&
|
||||||
git add f &&
|
git add f &&
|
||||||
git commit -q -m. f &&
|
git commit -q -m. f &&
|
||||||
printf "\ny\n" > f &&
|
printf "\ny\n" > f &&
|
||||||
|
after=$(git hash-object f) &&
|
||||||
|
after=$(git rev-parse --short $after) &&
|
||||||
|
sed -e "s/^index .*/index $before..$after 100644/" expected >exp &&
|
||||||
git config --bool diff.suppressBlankEmpty true &&
|
git config --bool diff.suppressBlankEmpty true &&
|
||||||
git diff f > actual &&
|
git diff f > actual &&
|
||||||
test_cmp exp actual &&
|
test_cmp exp actual &&
|
||||||
|
Reference in New Issue
Block a user