From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Lars Schneider" <larsxschneider@gmail.com>
Subject: [PATCH 23/28] t/lib-diff-alternative: abstract away SHA-1-specific constants
Date: Sun, 6 May 2018 23:17:47 +0000 [thread overview]
Message-ID: <20180506231752.975110-24-sandals@crustytoothpaste.net> (raw)
In-Reply-To: <20180506231752.975110-1-sandals@crustytoothpaste.net>
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>
---
t/lib-diff-alternative.sh | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/t/lib-diff-alternative.sh b/t/lib-diff-alternative.sh
index 8b4dbf22d2..8d1e408bb5 100644
--- a/t/lib-diff-alternative.sh
+++ b/t/lib-diff-alternative.sh
@@ -59,9 +59,11 @@ int main(int argc, char **argv)
}
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
-index 6faa5a3..e3af329 100644
+index $file1..$file2 100644
--- a/file1
+++ b/file2
@@ -1,26 +1,25 @@
@@ -136,9 +138,11 @@ e
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
-index b414108..0fdf397 100644
+index $uniq1..$uniq2 100644
--- a/uniq1
+++ b/uniq2
@@ -1,6 +1,6 @@
next prev parent reply other threads:[~2018-05-06 23:19 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-06 23:17 [PATCH 00/28] Hash-independent tests (part 2) brian m. carlson
2018-05-06 23:17 ` [PATCH 01/28] t/test-lib: add an SHA1 prerequisite brian m. carlson
2018-05-07 10:10 ` Martin Ågren
2018-05-07 23:30 ` brian m. carlson
2018-05-08 18:26 ` Martin Ågren
2018-05-08 23:46 ` brian m. carlson
2018-05-06 23:17 ` [PATCH 02/28] t/test-lib: introduce ZERO_OID brian m. carlson
2018-05-06 23:17 ` [PATCH 03/28] t: switch $_z40 to $ZERO_OID brian m. carlson
2018-05-06 23:17 ` [PATCH 04/28] t/test-lib: introduce FULL_HEX brian m. carlson
2018-05-06 23:53 ` Eric Sunshine
2018-05-07 2:28 ` brian m. carlson
2018-05-06 23:17 ` [PATCH 05/28] t: switch $_x40 to $FULL_HEX brian m. carlson
2018-05-06 23:17 ` [PATCH 06/28] t0000: annotate with SHA1 prerequisite brian m. carlson
2018-05-07 10:24 ` Martin Ågren
2018-05-07 23:40 ` brian m. carlson
2018-05-08 18:28 ` Martin Ågren
2018-05-09 0:13 ` brian m. carlson
2018-05-06 23:17 ` [PATCH 07/28] t1007: " brian m. carlson
2018-05-06 23:17 ` [PATCH 08/28] t1512: skip test if not using SHA-1 brian m. carlson
2018-05-06 23:17 ` [PATCH 09/28] t4044: " brian m. carlson
2018-05-06 23:17 ` [PATCH 10/28] t: skip pack tests " brian m. carlson
2018-05-07 10:30 ` Martin Ågren
2018-05-06 23:17 ` [PATCH 11/28] t2203: abstract away SHA-1-specific constants brian m. carlson
2018-05-06 23:17 ` [PATCH 12/28] t3103: " brian m. carlson
2018-05-06 23:17 ` [PATCH 13/28] t3702: " brian m. carlson
2018-05-06 23:17 ` [PATCH 14/28] t3905: " brian m. carlson
2018-05-07 0:03 ` Eric Sunshine
2018-05-07 2:30 ` brian m. carlson
2018-05-06 23:17 ` [PATCH 15/28] t4007: " brian m. carlson
2018-05-06 23:17 ` [PATCH 16/28] t4008: " brian m. carlson
2018-05-07 0:07 ` Eric Sunshine
2018-05-07 2:32 ` brian m. carlson
2018-05-06 23:17 ` [PATCH 17/28] t4014: " brian m. carlson
2018-05-06 23:17 ` [PATCH 18/28] t4020: " brian m. carlson
2018-05-06 23:17 ` [PATCH 19/28] t4022: " brian m. carlson
2018-05-06 23:17 ` [PATCH 20/28] t4029: fix test indentation brian m. carlson
2018-05-06 23:17 ` [PATCH 21/28] t4029: abstract away SHA-1-specific constants brian m. carlson
2018-05-06 23:17 ` [PATCH 22/28] t4030: " brian m. carlson
2018-05-06 23:17 ` brian m. carlson [this message]
2018-05-06 23:17 ` [PATCH 24/28] t4205: sort log output in a hash-independent way brian m. carlson
2018-05-06 23:17 ` [PATCH 25/28] t4042: abstract away SHA-1-specific constants brian m. carlson
2018-05-06 23:17 ` [PATCH 26/28] t4045: " brian m. carlson
2018-05-06 23:17 ` [PATCH 27/28] t4208: " brian m. carlson
2018-05-06 23:17 ` [PATCH 28/28] t5300: " brian m. carlson
2018-05-07 1:49 ` [PATCH 00/28] Hash-independent tests (part 2) Eric Sunshine
2018-05-07 2:40 ` brian m. carlson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180506231752.975110-24-sandals@crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=larsxschneider@gmail.com \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).