t/lib-diff-alternative: abstract away SHA-1-specific constants

Adjust the test code so that it computes variables for blobs instead of
using hard-coded hashes.  This makes t4033 and t4050 (the patience and
histogram tests) pass.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/lib-diff-alternative.sh b/t/lib-diff-alternative.sh
index 8b4dbf22d2d140bef7ca0e106a389cb0ca1d4681..8d1e408bb58f5e097f242d5c1fd2c7bb036deb6e 100644 (file)
--- a/t/lib-diff-alternative.sh
+++ b/t/lib-diff-alternative.sh
@@ -59,9 +59,11 @@ int main(int argc, char **argv)
 }
 EOF
 
 }
 EOF
 

-       cat >expect <<\EOF
+       file1=$(git rev-parse --short $(git hash-object file1))
+       file2=$(git rev-parse --short $(git hash-object file2))
+       cat >expect <<EOF

 diff --git a/file1 b/file2
 diff --git a/file1 b/file2

-index 6faa5a3..e3af329 100644
+index $file1..$file2 100644

 --- a/file1
 +++ b/file2
 @@ -1,26 +1,25 @@
 --- a/file1
 +++ b/file2
 @@ -1,26 +1,25 @@


@@ -136,9 +138,11 @@ e
 f
 EOF
 
 f
 EOF
 

-       cat >expect <<\EOF
+       uniq1=$(git rev-parse --short $(git hash-object uniq1))
+       uniq2=$(git rev-parse --short $(git hash-object uniq2))
+       cat >expect <<EOF

 diff --git a/uniq1 b/uniq2
 diff --git a/uniq1 b/uniq2

-index b414108..0fdf397 100644
+index $uniq1..$uniq2 100644

 --- a/uniq1
 +++ b/uniq2
 @@ -1,6 +1,6 @@
 --- a/uniq1
 +++ b/uniq2
 @@ -1,6 +1,6 @@