Skip to content

Commit a700395

Browse files
Martin Ågrengitster
authored andcommitted
t4200: drop irrelevant code
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 672d1b7 ("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 <[email protected]> Signed-off-by: Martin Ågren <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent bbea4dc commit a700395

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

t/t4200-rerere.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -365,9 +365,6 @@ test_expect_success 'set up an unresolved merge' '
365365
test_might_fail git config --unset rerere.autoupdate &&
366366
git reset --hard &&
367367
git checkout version2 &&
368-
fifth=$(git rev-parse fifth) &&
369-
echo "$fifth branch fifth of ." |
370-
git fmt-merge-msg >msg &&
371368
ancestor=$(git merge-base version2 fifth) &&
372369
test_must_fail git merge-recursive "$ancestor" -- HEAD fifth &&
373370

0 commit comments

Comments
 (0)