[PATCH 1/2] t3904: fix incorrect demonstration of a bug
- From
Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Apr 8, 2020, 18:52 UTC
- Message-ID
- <461fc76ed71fe79b61f3623b5ab094796723569b.1586371954.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.602.git.1586371954.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>
In 7e9e048661 (stash -p: demonstrate failure of split with mixed y/n, 2015-04-16), a regression test for a known breakage that was added to the test script `t3904-stash-patch.sh` that demonstrated that splitting a hunk and trying to stash only part of that split hunk fails (but shouldn't).
As expected, it still fails, but for the wrong reason: once the bug is fixed, we would expect stderr to show nothing, yet the regression test expects stderr to show something.
Let's fix that by telling that regression test case to expect nothing to be printed to stderr.
While at it, also drop the obvious left-over from debugging where the regression test did not mind `git stash -p` to return a non-zero exit status.
Of course, the regression test still fails, but this time for the correct reason.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- t/t3904-stash-patch.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t3904-stash-patch.sh b/t/t3904-stash-patch.sh index 9546b6f8a4e..ab7d7aa6de1 100755 --- a/t/t3904-stash-patch.sh +++ b/t/t3904-stash-patch.sh @@ -106,8 +106,8 @@ test_expect_failure 'stash -p with split hunk' ' ccc EOF printf "%s\n" s n y q | - test_might_fail git stash -p 2>error && - ! test_must_be_empty error && + git stash -p 2>error && + test_must_be_empty error && grep "added line 1" test && ! grep "added line 2" test '
-- gitgitgadget