git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Martin Ågren" <martin.agren@gmail.com>
To: git@vger.kernel.org
Cc: Eric Sunshine <sunshine@sunshineco.com>
Subject: [PATCH] t4200: drop irrelevant code
Date: Mon, 18 Jul 2022 17:43:22 +0200	[thread overview]
Message-ID: <20220718154322.2177166-1-martin.agren@gmail.com> (raw)

While setting up an unresolved merge for `git rerere`, we run `git
rev-parse` and `git fmt-merge-msg` to create a variable `$fifth` and a
commit-message file `msg`, which we then never actually use. This has
been like that since these tests were added in 672d1b789b ("rerere:
migrate to parse-options API", 2010-08-05). This does exercise `git
rev-parse` and `git fmt-merge-msg`, but doesn't contribute to testing
`git rerere`. Drop these lines.

Reported-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
---
 This is quite late fallout from Eric's review [1] of some commits that
 have already gone in.

 [1] https://lore.kernel.org/git/CAPig+cSjHg2-WYqdkZAS0ye1goj_=5RN3mdjt0-4kSBqNm6WLg@mail.gmail.com/

 t/t4200-rerere.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 9f8c76dffb..7025cfdae5 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -358,23 +358,20 @@ test_expect_success 'set up an unresolved merge' '
 	headblob=$(git rev-parse version2:file3) &&
 	mergeblob=$(git rev-parse fifth:file3) &&
 	cat >expected.unresolved <<-EOF &&
 	100644 $headblob 2	file3
 	100644 $mergeblob 3	file3
 	EOF
 
 	test_might_fail git config --unset rerere.autoupdate &&
 	git reset --hard &&
 	git checkout version2 &&
-	fifth=$(git rev-parse fifth) &&
-	echo "$fifth		branch fifth of ." |
-	git fmt-merge-msg >msg &&
 	ancestor=$(git merge-base version2 fifth) &&
 	test_must_fail git merge-recursive "$ancestor" -- HEAD fifth &&
 
 	git ls-files --stage >failedmerge &&
 	cp file3 file3.conflict &&
 
 	git ls-files -u >actual &&
 	test_cmp expected.unresolved actual
 '
 
-- 
2.37.1.373.g4dd4a117ec


             reply	other threads:[~2022-07-18 15:45 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-18 15:43 Martin Ågren [this message]
2022-07-18 18:01 ` [PATCH] t4200: drop irrelevant code Junio C Hamano
2022-07-19  5:21 ` Eric Sunshine

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=20220718154322.2177166-1-martin.agren@gmail.com \
    --to=martin.agren@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=sunshine@sunshineco.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).