mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
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>
This commit is contained in:
parent
75fe818442
commit
bdee9cd6c1
1 changed files with 6 additions and 3 deletions
|
@ -578,7 +578,11 @@ test_expect_success 'excessive subject' '
|
||||||
|
|
||||||
rm -rf patches/ &&
|
rm -rf patches/ &&
|
||||||
git checkout side &&
|
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 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 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 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 mv file foo &&
|
||||||
git commit -m foo &&
|
git commit -m foo &&
|
||||||
git format-patch --no-renames --cover-letter -1 &&
|
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
|
--- a/file
|
||||||
+++ b/file
|
+++ b/file
|
||||||
@@ -13,4 +13,20 @@ C
|
@@ -13,4 +13,20 @@ C
|
||||||
|
@ -640,7 +643,7 @@ test_expect_success 'format-patch respects -U' '
|
||||||
cat > expect << EOF
|
cat > expect << EOF
|
||||||
|
|
||||||
diff --git a/file b/file
|
diff --git a/file b/file
|
||||||
index 40f36c6..2dc5c23 100644
|
index $before..$after 100644
|
||||||
--- a/file
|
--- a/file
|
||||||
+++ b/file
|
+++ b/file
|
||||||
@@ -14,3 +14,19 @@ C
|
@@ -14,3 +14,19 @@ C
|
||||||
|
|
Loading…
Reference in a new issue