t3903: stop hard-coding commit sha1s
When testing the diff output of "git stash list", we look for the stash's subject of "WIP on master: $sha1", even though it's not relevant to the diff output. This makes the test brittle to refactoring, as any changes to earlier tests may impact the commit sha1. Since we don't care about the commit subject here, we can simply ask stash not to print it. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Apr 22, 2015 at 15:30 UTC
f2f3fc95478c21687646a71f934c524a45e3ec03
1 file changed
+5
-5
t/t3903-stash.sh
+5
-5
@@ -695,8 +695,8 @@ test_expect_success 'setup stash with index and worktree changes' '
695
'
696
697
test_expect_success 'stash list implies --first-parent -m' '
698
- cat >expect <<-\EOF &&
699
- stash@{0}: WIP on master: b27a2bc subdir
698
+ cat >expect <<-EOF &&
699
+ stash@{0}
700
701
diff --git a/file b/file
702
index 257cc56..d26b33d 100644
@@ -706,13 +706,13 @@ test_expect_success 'stash list implies --first-parent -m' '
706
-foo
707
+working
708
EOF
709
- git stash list -p >actual &&
709
+ git stash list --format=%gd -p >actual &&
710
test_cmp expect actual
711
'
712
713
test_expect_success 'stash list --cc shows combined diff' '
714
cat >expect <<-\EOF &&
715
- stash@{0}: WIP on master: b27a2bc subdir
715
+ stash@{0}
716
717
diff --cc file
718
index 257cc56,9015a7a..d26b33d
@@ -723,7 +723,7 @@ test_expect_success 'stash list --cc shows combined diff' '
723
-index
724
++working
725
EOF
726
- git stash list -p --cc >actual &&
726
+ git stash list --format=%gd -p --cc >actual &&
727
test_cmp expect actual
728
'
729