[PATCH v5 20/29] t3440: drop redundant resets and pass branch to rebase where needed

Li Chen
2025-10-22T05:43:46Z

From: Li Chen <chenl311@chinatelecom.cn>

Stop hard-resetting to third in these tests. Where the branch matters,
invoke git rebase -m ... HEAD~1 third to make the target explicit and
preserve the original semantics.

Signed-off-by: Li Chen <chenl311@chinatelecom.cn>
---
t/t3440-rebase-trailer.sh | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/t/t3440-rebase-trailer.sh b/t/t3440-rebase-trailer.sh
index 1571dd2c97..504bdd86fc 100755
--- a/t/t3440-rebase-trailer.sh
+++ b/t/t3440-rebase-trailer.sh
@@ -39,21 +39,18 @@ test_expect_success 'apply backend is rejected with --trailer' '
'

test_expect_success 'reject empty --trailer argument' '
- git reset --hard third &&
test_expect_code 128 git rebase -m --trailer "" HEAD^ 2>err &&
test_grep "empty --trailer" err
'

test_expect_success 'reject trailer with missing key before separator' '
- git reset --hard third &&
test_expect_code 128 git rebase -m --trailer ": no-key" HEAD^ 2>err &&
test_grep "missing key before separator" err
'

test_expect_success 'CLI trailer duplicates allowed; replace policy keeps last' '
- git reset --hard third &&
git -c trailer.Bug.ifexists=replace -c trailer.Bug.ifmissing=add \
- rebase -m --trailer "Bug: 123" --trailer "Bug: 456" HEAD~1 &&
+ rebase -m --trailer "Bug: 123" --trailer "Bug: 456" HEAD~1 third &&
cat >expect <<-\EOF &&
third

@@ -63,10 +60,9 @@ test_expect_success 'CLI trailer duplicates allowed; replace policy keeps last'
'

test_expect_success 'multiple Signed-off-by trailers all preserved' '
- git reset --hard third &&
git rebase -m \
--trailer "Signed-off-by: Dev A <a@ex.com>" \
- --trailer "Signed-off-by: Dev B <b@ex.com>" HEAD~1 &&
+ --trailer "Signed-off-by: Dev B <b@ex.com>" HEAD~1 third &&
cat >expect <<-\EOF &&
third

@@ -78,7 +74,6 @@ test_expect_success 'multiple Signed-off-by trailers all preserved' '

test_expect_success 'rebase -m --trailer adds trailer after conflicts' '
create_expect file2-signed "file-2" &&
- git reset --hard third &&
test_must_fail git rebase -m \
--trailer "Reviewed-by: Dev <dev@example.com>" \
second third &&
--
2.51.0