diff options
| author | Martin Ågren <martin.agren@gmail.com> | 2022-07-18 15:43:22 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-07-18 18:01:54 (GMT) |
| commit | a700395eaf7aaa833c0643f7f741603c56893edd (patch) | |
| tree | 55ad04443a08ceb59e3497b441e63d4ce1be2c43 /t | |
| parent | bbea4dcf42b28eb7ce64a6306cdde875ae5d09ca (diff) | |
| download | git-a700395eaf7aaa833c0643f7f741603c56893edd.zip git-a700395eaf7aaa833c0643f7f741603c56893edd.tar.gz git-a700395eaf7aaa833c0643f7f741603c56893edd.tar.bz2 | |
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 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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4200-rerere.sh | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh index 9f8c76d..7025cfd 100755 --- a/t/t4200-rerere.sh +++ b/t/t4200-rerere.sh @@ -365,9 +365,6 @@ test_expect_success 'set up an unresolved merge' ' 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 && |