t4014: abstract away SHA-1-specific constants

Adjust the test so that it computes values 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>

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index dac3f349a3247004d9375a0f6f96befc5c00cf9c..349029f43b0f02e549ff3212c42eac9043ee8573 100755 (executable)
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -578,7 +578,11 @@ test_expect_success 'excessive subject' '
 
        rm -rf patches/ &&
        git checkout side &&
 
        rm -rf patches/ &&
        git checkout side &&

+       before=$(git hash-object file) &&
+       before=$(git rev-parse --short $before) &&

        for i in 5 6 1 2 3 A 4 B C 7 8 9 10 D E F; do echo "$i"; done >>file &&
        for i in 5 6 1 2 3 A 4 B C 7 8 9 10 D E F; do echo "$i"; done >>file &&

+       after=$(git hash-object file) &&
+       after=$(git rev-parse --short $after) &&

        git update-index file &&
        git commit -m "This is an excessively long subject line for a message due to the habit some projects have of not having a short, one-line subject at the start of the commit message, but rather sticking a whole paragraph right at the start as the only thing in the commit message. It had better not become the filename for the patch." &&
        git format-patch -o patches/ master..side &&
        git update-index file &&
        git commit -m "This is an excessively long subject line for a message due to the habit some projects have of not having a short, one-line subject at the start of the commit message, but rather sticking a whole paragraph right at the start as the only thing in the commit message. It had better not become the filename for the patch." &&
        git format-patch -o patches/ master..side &&


@@ -586,7 +590,6 @@ test_expect_success 'excessive subject' '
 '
 
 test_expect_success 'cover-letter inherits diff options' '
 '
 
 test_expect_success 'cover-letter inherits diff options' '

-

        git mv file foo &&
        git commit -m foo &&
        git format-patch --no-renames --cover-letter -1 &&
        git mv file foo &&
        git commit -m foo &&
        git format-patch --no-renames --cover-letter -1 &&


@@ -616,7 +619,7 @@ test_expect_success 'shortlog of cover-letter wraps overly-long onelines' '
 '
 
 cat > expect << EOF
 '
 
 cat > expect << EOF

-index 40f36c6..2dc5c23 100644
+index $before..$after 100644

 --- a/file
 +++ b/file
 @@ -13,4 +13,20 @@ C
 --- a/file
 +++ b/file
 @@ -13,4 +13,20 @@ C


@@ -640,7 +643,7 @@ test_expect_success 'format-patch respects -U' '
 cat > expect << EOF
 
 diff --git a/file b/file
 cat > expect << EOF
 
 diff --git a/file b/file

-index 40f36c6..2dc5c23 100644
+index $before..$after 100644

 --- a/file
 +++ b/file
 @@ -14,3 +14,19 @@ C
 --- a/file
 +++ b/file
 @@ -14,3 +14,19 @@ C