t4045: abstract away SHA-1-specific constants

diff --git a/t/t4029-diff-trailing-space.sh b/t/t4029-diff-trailing-space.sh
index 3ccc237a8d4443bfc8763fbb9cb51033f846b0e8..32b6e9a4e76217d8de771b405dd3ce57c73643ad 100755 (executable)
--- a/t/t4029-diff-trailing-space.sh
+++ b/t/t4029-diff-trailing-space.sh
@@ -6,7 +6,7 @@ test_description='diff honors config option, diff.suppressBlankEmpty'
 
 . ./test-lib.sh
 
-cat <<\EOF > exp ||
+cat <<\EOF >expected ||
 diff --git a/f b/f
 index 5f6a263..8cb8bae 100644
 --- a/f
@@ -18,22 +18,26 @@ index 5f6a263..8cb8bae 100644
 EOF
 exit 1
 
-test_expect_success \
-    "$test_description" \
-    'printf "\nx\n" > f &&
-     git add f &&
-     git commit -q -m. f &&
-     printf "\ny\n" > f &&
-     git config --bool diff.suppressBlankEmpty true &&
-     git diff f > actual &&
-     test_cmp exp actual &&
-     perl -i.bak -p -e "s/^\$/ /" exp &&
-     git config --bool diff.suppressBlankEmpty false &&
-     git diff f > actual &&
-     test_cmp exp actual &&
-     git config --bool --unset diff.suppressBlankEmpty &&
-     git diff f > actual &&
-     test_cmp exp actual
-     '
+test_expect_success "$test_description" '
+       printf "\nx\n" > f &&
+       before=$(git hash-object f) &&
+       before=$(git rev-parse --short $before) &&
+       git add f &&
+       git commit -q -m. 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 diff f > actual &&
+       test_cmp exp actual &&
+       perl -i.bak -p -e "s/^\$/ /" exp &&
+       git config --bool diff.suppressBlankEmpty false &&
+       git diff f > actual &&
+       test_cmp exp actual &&
+       git config --bool --unset diff.suppressBlankEmpty &&
+       git diff f > actual &&
+       test_cmp exp actual
+'
 
 test_done