From 635c158b549ae21516b222474fe8dc79ce6dca8c Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Mon, 21 Oct 2024 10:43:42 -0700 Subject: [PATCH] fixup! filter-repo: update commit-map metadata file instead of overwriting --- t/t9393-rerun.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/t/t9393-rerun.sh b/t/t9393-rerun.sh index 60659acc..a8389369 100755 --- a/t/t9393-rerun.sh +++ b/t/t9393-rerun.sh @@ -325,8 +325,8 @@ test_expect_success 'modify a file, then remove a later file' ' FILE_D_CHANGE=$(git rev-list -1 HEAD -- fileD) && ORIGINAL_TAG=$(git rev-parse v1.0) && - git filter-repo --force \ - --replace-text <(echo "file 3 contents==>Alternate C") && + echo "file 3 contents==>Alternate C" >changes && + git filter-repo --force --replace-text changes && NEW_FILE_C_CHANGE=$(git rev-list -1 HEAD -- fileC) && @@ -387,8 +387,8 @@ test_expect_success 'modify a file, then remove a later file via --refs' ' FILE_D_CHANGE=$(git rev-list -1 HEAD -- fileD) && ORIGINAL_TAG=$(git rev-parse v1.0) && - git filter-repo --force \ - --replace-text <(echo "file 2 contents==>Alternate B") && + echo "file 2 contents==>Alternate B" >changes && + git filter-repo --force --replace-text changes && NEW_FILE_B_CHANGE=$(git rev-list -1 HEAD -- fileB) && NEW_FILE_C_CHANGE=$(git rev-list -1 HEAD -- fileC) && @@ -449,8 +449,8 @@ test_expect_success 'modify a file, then remove an earlier file' ' FILE_D_CHANGE=$(git rev-list -1 HEAD -- fileD) && ORIGINAL_TAG=$(git rev-parse v1.0) && - git filter-repo --force \ - --replace-text <(echo "file 3 contents==>Alternate C") && + echo "file 3 contents==>Alternate C" >changes && + git filter-repo --force --replace-text changes && NEW_FILE_C_CHANGE=$(git rev-list -1 HEAD -- fileC) && @@ -506,8 +506,9 @@ test_expect_success 'use --refs heavily with a rerun' ' FILE_C_CHANGE=$(git rev-list -1 HEAD -- fileC) && FILE_D_CHANGE=$(git rev-list -1 HEAD -- fileD) && + echo "Tweak it==>Modify it" >changes && git filter-repo --force --refs orphan-me \ - --replace-message <(echo "Tweak it==>Modify it") && + --replace-message changes && NEW_FINAL_ORPHAN=$(git rev-list -1 orphan-me) &&