[PATCH 1/3] t3903: stop hard-coding commit sha1s
- From
Jeff King <peff@peff.net>
- Date
- Apr 22, 2015, 19:30 UTC
- Message-ID
- <20150422193052.GA27945@peff.net>
- In-Reply-To
- <20150422192948.GA27656@peff.net>
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> --- t/t3903-stash.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 1e29962..6da4856 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 '
-- 2.4.0.rc2.498.g02440db