summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-08-11 04:52:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-08-11 04:52:35 (GMT)
commit5856cb98c016657f793ec632ea42c4bb0add0101 (patch)
tree300416597854feb9f147210071446ab38d71b602
parent042159a5093db5da1be2a90b7c1b88441ece6029 (diff)
parenta700395eaf7aaa833c0643f7f741603c56893edd (diff)
downloadgit-5856cb98c016657f793ec632ea42c4bb0add0101.zip
git-5856cb98c016657f793ec632ea42c4bb0add0101.tar.gz
git-5856cb98c016657f793ec632ea42c4bb0add0101.tar.bz2
Merge branch 'ma/t4200-update' into maint
Test fix. source: <20220718154322.2177166-1-martin.agren@gmail.com> * ma/t4200-update: t4200: drop irrelevant code
-rwxr-xr-xt/t4200-rerere.sh3
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 &&