Merge branch 'ua/t3404-cleanup'

Test update.

* ua/t3404-cleanup:
  t3404: replace test with test_line_count()
  t3404: avoid losing exit status with focus on `git show` and `git cat-file`
maint
Taylor Blau 2024-11-01 12:53:18 -04:00
commit a524cc77ad
1 changed files with 50 additions and 25 deletions

View File

@ -281,8 +281,9 @@ test_expect_success 'stop on conflicting pick' '
test_cmp expect2 file1 && test_cmp expect2 file1 &&
test "$(git diff --name-status | test "$(git diff --name-status |
sed -n -e "/^U/s/^U[^a-z]*//p")" = file1 && sed -n -e "/^U/s/^U[^a-z]*//p")" = file1 &&
test 4 = $(grep -v "^#" < .git/rebase-merge/done | wc -l) && grep -v "^#" <.git/rebase-merge/done >actual &&
test 0 = $(grep -c "^[^#]" < .git/rebase-merge/git-rebase-todo) test_line_count = 4 actual &&
test 0 = $(grep -c "^[^#]" <.git/rebase-merge/git-rebase-todo)
' '


test_expect_success 'show conflicted patch' ' test_expect_success 'show conflicted patch' '
@ -319,7 +320,8 @@ test_expect_success 'retain authorship' '
GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" && GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
git tag twerp && git tag twerp &&
git rebase -i --onto primary HEAD^ && git rebase -i --onto primary HEAD^ &&
git show HEAD | grep "^Author: Twerp Snog" git show HEAD >actual &&
grep "^Author: Twerp Snog" actual
' '


test_expect_success 'retain authorship w/ conflicts' ' test_expect_success 'retain authorship w/ conflicts' '
@ -360,7 +362,8 @@ test_expect_success 'squash' '
' '


test_expect_success 'retain authorship when squashing' ' test_expect_success 'retain authorship when squashing' '
git show HEAD | grep "^Author: Twerp Snog" git show HEAD >actual &&
grep "^Author: Twerp Snog" actual
' '


test_expect_success '--continue tries to commit' ' test_expect_success '--continue tries to commit' '
@ -374,7 +377,8 @@ test_expect_success '--continue tries to commit' '
FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue
) && ) &&
test_cmp_rev HEAD^ new-branch1 && test_cmp_rev HEAD^ new-branch1 &&
git show HEAD | grep chouette git show HEAD >actual &&
grep chouette actual
' '


test_expect_success 'verbose flag is heeded, even after --continue' ' test_expect_success 'verbose flag is heeded, even after --continue' '
@ -397,7 +401,9 @@ test_expect_success 'multi-squash only fires up editor once' '
git rebase -i $base git rebase -i $base
) && ) &&
test $base = $(git rev-parse HEAD^) && test $base = $(git rev-parse HEAD^) &&
test 1 = $(git show | grep ONCE | wc -l) git show >output &&
grep ONCE output >actual &&
test_line_count = 1 actual
' '


test_expect_success 'multi-fixup does not fire up editor' ' test_expect_success 'multi-fixup does not fire up editor' '
@ -410,7 +416,8 @@ test_expect_success 'multi-fixup does not fire up editor' '
git rebase -i $base git rebase -i $base
) && ) &&
test $base = $(git rev-parse HEAD^) && test $base = $(git rev-parse HEAD^) &&
test 0 = $(git show | grep NEVER | wc -l) && git show >output &&
! grep NEVER output &&
git checkout @{-1} && git checkout @{-1} &&
git branch -D multi-fixup git branch -D multi-fixup
' '
@ -428,7 +435,9 @@ test_expect_success 'commit message used after conflict' '
git rebase --continue git rebase --continue
) && ) &&
test $base = $(git rev-parse HEAD^) && test $base = $(git rev-parse HEAD^) &&
test 1 = $(git show | grep ONCE | wc -l) && git show >output &&
grep ONCE output >actual &&
test_line_count = 1 actual &&
git checkout @{-1} && git checkout @{-1} &&
git branch -D conflict-fixup git branch -D conflict-fixup
' '
@ -446,7 +455,9 @@ test_expect_success 'commit message retained after conflict' '
git rebase --continue git rebase --continue
) && ) &&
test $base = $(git rev-parse HEAD^) && test $base = $(git rev-parse HEAD^) &&
test 2 = $(git show | grep TWICE | wc -l) && git show >output &&
grep TWICE output >actual &&
test_line_count = 2 actual &&
git checkout @{-1} && git checkout @{-1} &&
git branch -D conflict-squash git branch -D conflict-squash
' '
@ -470,10 +481,10 @@ test_expect_success 'squash and fixup generate correct log messages' '
) && ) &&
git cat-file commit HEAD | sed -e 1,/^\$/d > actual-squash-fixup && git cat-file commit HEAD | sed -e 1,/^\$/d > actual-squash-fixup &&
test_cmp expect-squash-fixup actual-squash-fixup && test_cmp expect-squash-fixup actual-squash-fixup &&
git cat-file commit HEAD@{2} | git cat-file commit HEAD@{2} >actual &&
grep "^# This is a combination of 3 commits\." && grep "^# This is a combination of 3 commits\." actual &&
git cat-file commit HEAD@{3} | git cat-file commit HEAD@{3} >actual &&
grep "^# This is a combination of 2 commits\." && grep "^# This is a combination of 2 commits\." actual &&
git checkout @{-1} && git checkout @{-1} &&
git branch -D squash-fixup git branch -D squash-fixup
' '
@ -489,7 +500,9 @@ test_expect_success 'squash ignores comments' '
git rebase -i $base git rebase -i $base
) && ) &&
test $base = $(git rev-parse HEAD^) && test $base = $(git rev-parse HEAD^) &&
test 1 = $(git show | grep ONCE | wc -l) && git show >output &&
grep ONCE output >actual &&
test_line_count = 1 actual &&
git checkout @{-1} && git checkout @{-1} &&
git branch -D skip-comments git branch -D skip-comments
' '
@ -505,7 +518,9 @@ test_expect_success 'squash ignores blank lines' '
git rebase -i $base git rebase -i $base
) && ) &&
test $base = $(git rev-parse HEAD^) && test $base = $(git rev-parse HEAD^) &&
test 1 = $(git show | grep ONCE | wc -l) && git show >output &&
grep ONCE output >actual &&
test_line_count = 1 actual &&
git checkout @{-1} && git checkout @{-1} &&
git branch -D skip-blank-lines git branch -D skip-blank-lines
' '
@ -572,7 +587,8 @@ test_expect_success '--continue tries to commit, even for "edit"' '
FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue
) && ) &&
test edited = $(git show HEAD:file7) && test edited = $(git show HEAD:file7) &&
git show HEAD | grep chouette && git show HEAD >actual &&
grep chouette actual &&
test $parent = $(git rev-parse HEAD^) test $parent = $(git rev-parse HEAD^)
' '


@ -757,19 +773,23 @@ test_expect_success 'reword' '
set_fake_editor && set_fake_editor &&
FAKE_LINES="1 2 3 reword 4" FAKE_COMMIT_MESSAGE="E changed" \ FAKE_LINES="1 2 3 reword 4" FAKE_COMMIT_MESSAGE="E changed" \
git rebase -i A && git rebase -i A &&
git show HEAD | grep "E changed" && git show HEAD >actual &&
grep "E changed" actual &&
test $(git rev-parse primary) != $(git rev-parse HEAD) && test $(git rev-parse primary) != $(git rev-parse HEAD) &&
test_cmp_rev primary^ HEAD^ && test_cmp_rev primary^ HEAD^ &&
FAKE_LINES="1 2 reword 3 4" FAKE_COMMIT_MESSAGE="D changed" \ FAKE_LINES="1 2 reword 3 4" FAKE_COMMIT_MESSAGE="D changed" \
git rebase -i A && git rebase -i A &&
git show HEAD^ | grep "D changed" && git show HEAD^ >actual &&
grep "D changed" actual &&
FAKE_LINES="reword 1 2 3 4" FAKE_COMMIT_MESSAGE="B changed" \ FAKE_LINES="reword 1 2 3 4" FAKE_COMMIT_MESSAGE="B changed" \
git rebase -i A && git rebase -i A &&
git show HEAD~3 | grep "B changed" && git show HEAD~3 >actual &&
grep "B changed" actual &&
FAKE_LINES="1 r 2 pick 3 p 4" FAKE_COMMIT_MESSAGE="C changed" \ FAKE_LINES="1 r 2 pick 3 p 4" FAKE_COMMIT_MESSAGE="C changed" \
git rebase -i A git rebase -i A
) && ) &&
git show HEAD~2 | grep "C changed" git show HEAD~2 >actual &&
grep "C changed" actual
' '


test_expect_success 'no uncommitted changes when rewording and the todo list is reloaded' ' test_expect_success 'no uncommitted changes when rewording and the todo list is reloaded' '
@ -1003,8 +1023,10 @@ test_expect_success 'rebase -i --root retain root commit author and message' '
set_fake_editor && set_fake_editor &&
FAKE_LINES="2" git rebase -i --root FAKE_LINES="2" git rebase -i --root
) && ) &&
git cat-file commit HEAD | grep -q "^author Twerp Snog" && git cat-file commit HEAD >output &&
git cat-file commit HEAD | grep -q "^different author$" grep -q "^author Twerp Snog" output &&
git cat-file commit HEAD >actual &&
grep -q "^different author$" actual
' '


test_expect_success 'rebase -i --root temporary sentinel commit' ' test_expect_success 'rebase -i --root temporary sentinel commit' '
@ -1013,7 +1035,8 @@ test_expect_success 'rebase -i --root temporary sentinel commit' '
set_fake_editor && set_fake_editor &&
test_must_fail env FAKE_LINES="2" git rebase -i --root test_must_fail env FAKE_LINES="2" git rebase -i --root
) && ) &&
git cat-file commit HEAD | grep "^tree $EMPTY_TREE" && git cat-file commit HEAD >actual &&
grep "^tree $EMPTY_TREE" actual &&
git rebase --abort git rebase --abort
' '


@ -1036,7 +1059,8 @@ test_expect_success 'rebase -i --root reword original root commit' '
FAKE_LINES="reword 1 2" FAKE_COMMIT_MESSAGE="A changed" \ FAKE_LINES="reword 1 2" FAKE_COMMIT_MESSAGE="A changed" \
git rebase -i --root git rebase -i --root
) && ) &&
git show HEAD^ | grep "A changed" && git show HEAD^ >actual &&
grep "A changed" actual &&
test -z "$(git show -s --format=%p HEAD^)" test -z "$(git show -s --format=%p HEAD^)"
' '


@ -1048,7 +1072,8 @@ test_expect_success 'rebase -i --root reword new root commit' '
FAKE_LINES="reword 3 1" FAKE_COMMIT_MESSAGE="C changed" \ FAKE_LINES="reword 3 1" FAKE_COMMIT_MESSAGE="C changed" \
git rebase -i --root git rebase -i --root
) && ) &&
git show HEAD^ | grep "C changed" && git show HEAD^ >actual &&
grep "C changed" actual &&
test -z "$(git show -s --format=%p HEAD^)" test -z "$(git show -s --format=%p HEAD^)"
' '