From: Labnann <khalid.masum.92@gmail.com>
To: avarab@gmail.com
Cc: git@vger.kernel.org, gitgitgadget@gmail.com, khalid.masum.92@gmail.com
Subject: [PATCH v2 3/3] t3501: test cherry-pick revert with oids
Date: Thu, 31 Mar 2022 19:15:25 +0000 [thread overview]
Message-ID: <20220331191525.17927-4-khalid.masum.92@gmail.com> (raw)
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 <khalid.masum.92@gmail.com>
---
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
next prev parent reply other threads:[~2022-03-31 19:15 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-30 21:43 [PATCH] t3501: use test_path_is_* functions Labnan via GitGitGadget
2022-03-30 22:11 ` Ævar Arnfjörð Bjarmason
2022-03-31 19:15 ` [PATCH v2 0/3][GSoC] t3501: remove test and test -f Labnann
2022-03-31 19:15 ` [PATCH v2 1/3] t3501: use test_path_is_* functions Labnann
2022-03-31 19:15 ` [PATCH v2 2/3] t3501: don't ignore "git <cmd>" exit code Labnann
2022-04-01 18:10 ` Junio C Hamano
2022-03-31 19:15 ` Labnann [this message]
2022-04-01 18:24 ` [PATCH v2 3/3] t3501: test cherry-pick revert with oids Junio C Hamano
2022-04-02 19:24 ` [PATCH v3 0/1][GSoC] t3501: remove redundant file checking and stop ignoring git <cmd> exit code Labnann
2022-04-02 19:24 ` [PATCH v3 1/1] t3501: remove redundant file check " Labnann
2022-04-04 15:54 ` Junio C Hamano
2022-04-05 13:47 ` [PATCH v4 0/1][GSoC] t3501: remove test -f " Khalid Masum
2022-04-05 13:47 ` [PATCH v4 1/1] " Khalid Masum
2022-04-05 15:06 ` [PATCH v4 0/1][GSoC] " Khalid Masum
2022-04-05 15:06 ` [PATCH v4 1/1] " Khalid Masum
2022-04-22 11:26 ` [PATCH v2] " Labnan via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220331191525.17927-4-khalid.masum.92@gmail.com \
--to=khalid.masum.92@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).