From: Labnann Date: Thu, 31 Mar 2022 19:15:25 GMT Subject: [PATCH v2 3/3] t3501: test cherry-pick revert with oids Message-ID: <20220331191525.17927-4-khalid.masum.92@gmail.com> In-Reply-To: <20220331191525.17927-1-khalid.masum.92@gmail.com> we did a revert of a file we had so that it's the same as in "initial", but now it's at a different path, which we can exhaustively do by checking the blob OIDs Signed-off-by: Labnann --- t/t3501-revert-cherry-pick.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh index bd19c272d6..08103923ab 100755 --- a/t/t3501-revert-cherry-pick.sh +++ b/t/t3501-revert-cherry-pick.sh @@ -72,8 +72,7 @@ test_expect_success 'cherry-pick after renaming branch' ' git checkout rename2 && git cherry-pick added && - test_cmp_rev_parse HEAD^ rename2 && - test_path_is_file opos && + test_cmp_rev_parse rename2 HEAD^ && grep "Add extra line at the end" opos && git reflog -1 | grep cherry-pick @@ -83,9 +82,8 @@ test_expect_success 'revert after renaming branch' ' git checkout rename1 && git revert added && - test_cmp_rev_parse HEAD^ rename1 && - test_path_is_file spoo && - ! grep "Add extra line at the end" spoo && + test_cmp_rev_parse rename1 HEAD^ && + test_cmp_rev_parse initial:oops HEAD:spoo && git reflog -1 | grep revert ' -- 2.35.1