t3903-stash: don't try to grep non-existing file
The test 'store updates stash ref and reflog' in 't3903-stash.sh' creates a stash from a new file, runs 'git reset --hard' to throw away any modifications to the work tree, and then runs '! grep' to ensure that the staged contents are gone. Since the file didn't exist before, it shouldn't exist after 'git reset' either. Consequently, this 'grep' doesn't fail as expected, because it can't find the staged content, but it fails because it can't open the file. Tighten this check by using 'test_path_is_missing' instead, thereby avoiding an unexpected error from 'grep' as well. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
SZEDER Gábor committed
Aug 22, 2018 at 20:13 UTC
79b04f9b60cb60859ec8d65eec3dc9ac9626f63b
1 file changed
+1
-1
t/t3903-stash.sh
+1
-1
@@ -724,7 +724,7 @@ test_expect_success 'store updates stash ref and reflog' '
724
git add bazzy &&
725
STASH_ID=$(git stash create) &&
726
git reset --hard &&
727
- ! grep quux bazzy &&
727
+ test_path_is_missing bazzy &&
728
git stash store -m quuxery $STASH_ID &&
729
test $(git rev-parse stash) = $STASH_ID &&
730
git reflog --format=%H stash| grep $STASH_ID &&