Skip to content

Commit

Permalink
fixup! filter-repo: update commit-map metadata file instead of overwr…
Browse files Browse the repository at this point in the history
…iting
  • Loading branch information
newren committed Oct 21, 2024
1 parent 1b113c5 commit 635c158
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions t/t9393-rerun.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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) &&
Expand Down Expand Up @@ -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) &&
Expand Down Expand Up @@ -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) &&
Expand Down Expand Up @@ -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) &&
Expand Down

0 comments on commit 635c158

Please sign in to comment.