Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t3201: abstract away SHA-1-specific constants
author
brian m. carlson
<sandals@crustytoothpaste.net>
Sun, 18 Aug 2019 19:16:33 +0000
(19:16 +0000)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 20 Aug 2019 18:09:21 +0000
(11:09 -0700)
Adjust the test so that it computes variables for object IDs instead of
using hard-coded hashes.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3201-branch-contains.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
5fa0f52
)
diff --git
a/t/t3201-branch-contains.sh
b/t/t3201-branch-contains.sh
index 0ea4fc46949daf8d9522ff9ae52d8583ca5e9754..40251c9f8f68cbfba145976eb912ecdd3364dc65 100755
(executable)
--- a/
t/t3201-branch-contains.sh
+++ b/
t/t3201-branch-contains.sh
@@
-192,10
+192,10
@@
test_expect_success 'branch --merged with --verbose' '
EOF
test_cmp expect actual &&
git branch --verbose --merged topic >actual &&
- cat >expect <<-
\
EOF &&
- master
c77a0a9
second on master
- * topic
2c939f4
[ahead 1] foo
- zzz
c77a0a9
second on master
+ cat >expect <<-EOF &&
+ master
$(git rev-parse --short master)
second on master
+ * topic
$(git rev-parse --short topic )
[ahead 1] foo
+ zzz
$(git rev-parse --short zzz )
second on master
EOF
test_i18ncmp expect actual
'