diff options
| author |  Jeff King <peff@peff.net> | 2015-04-22 15:30:52 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-04-22 13:38:58 -0700 |
| commit | f2f3fc95478c21687646a71f934c524a45e3ec03 (patch) | |
| tree | 0a4be59da5f21abfa84c0b6dec217b56280d1663 | |
| parent | Git 2.2.2 (diff) | |
| download | tgif-f2f3fc95478c21687646a71f934c524a45e3ec03.tar.xz | |
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>
| -rwxr-xr-x | t/t3903-stash.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 1e29962fad..6da48562a3 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -695,8 +695,8 @@ test_expect_success 'setup stash with index and worktree changes' ' ' test_expect_success 'stash list implies --first-parent -m' ' - cat >expect <<-\EOF && - stash@{0}: WIP on master: b27a2bc subdir + cat >expect <<-EOF && + stash@{0} diff --git a/file b/file index 257cc56..d26b33d 100644 @@ -706,13 +706,13 @@ test_expect_success 'stash list implies --first-parent -m' ' -foo +working EOF - git stash list -p >actual && + git stash list --format=%gd -p >actual && test_cmp expect actual ' test_expect_success 'stash list --cc shows combined diff' ' cat >expect <<-\EOF && - stash@{0}: WIP on master: b27a2bc subdir + stash@{0} diff --cc file index 257cc56,9015a7a..d26b33d @@ -723,7 +723,7 @@ test_expect_success 'stash list --cc shows combined diff' ' -index ++working EOF - git stash list -p --cc >actual && + git stash list --format=%gd -p --cc >actual && test_cmp expect actual ' |