]> git.ipfire.org Git - thirdparty/git.git/commit
t3420-rebase-autostash: don't try to grep non-existing files
authorSZEDER Gábor <szeder.dev@gmail.com>
Wed, 22 Aug 2018 18:13:20 +0000 (20:13 +0200)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Aug 2018 18:52:51 +0000 (11:52 -0700)
commit2745817028f6fc7502f295fd3694176778cecf54
treeecd70495cbd614f48325bf84fafa1a02474bd111
parent53f9a3e157dbbc901a02ac2c73346d375e24978c
t3420-rebase-autostash: don't try to grep non-existing files

Several tests in 't3420-rebase-autostash.sh' start various rebase
processes that are expected to fail because of merge conflicts.  These
tests then run '! grep' to ensure that the autostash feature did its
job, and the dirty contents of a file is gone.  However, due to the
test repo's history and the choice of upstream branch that file
shouldn't exist in the conflicted state at all.  Consequently, this
'grep' doesn't fail as expected, because it can't find the dirty
content, but it fails because it can't open the file.

Tighten this check by using 'test_path_is_missing' instead, thereby
avoiding unexpected errors from 'grep' as well.

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3420-rebase-autostash.sh