diff options
Diffstat (limited to 'third_party/git/t/t3429-rebase-edit-todo.sh')
| -rwxr-xr-x | third_party/git/t/t3429-rebase-edit-todo.sh | 53 |
1 files changed, 2 insertions, 51 deletions
diff --git a/third_party/git/t/t3429-rebase-edit-todo.sh b/third_party/git/t/t3429-rebase-edit-todo.sh index 7024d49ae7b9..76f6d306eaf3 100755 --- a/third_party/git/t/t3429-rebase-edit-todo.sh +++ b/third_party/git/t/t3429-rebase-edit-todo.sh @@ -3,21 +3,15 @@ test_description='rebase should reread the todo file if an exec modifies it' . ./test-lib.sh -. "$TEST_DIRECTORY"/lib-rebase.sh - -test_expect_success 'setup' ' - test_commit first file && - test_commit second file && - test_commit third file -' test_expect_success 'rebase exec modifies rebase-todo' ' + test_commit initial && todo=.git/rebase-merge/git-rebase-todo && git rebase HEAD -x "echo exec touch F >>$todo" && test -e F ' -test_expect_success 'loose object cache vs re-reading todo list' ' +test_expect_success SHA1 'loose object cache vs re-reading todo list' ' GIT_REBASE_TODO=.git/rebase-merge/git-rebase-todo && export GIT_REBASE_TODO && write_script append-todo.sh <<-\EOS && @@ -39,47 +33,4 @@ test_expect_success 'loose object cache vs re-reading todo list' ' git rebase HEAD -x "./append-todo.sh 5 6" ' -test_expect_success 'todo is re-read after reword and squash' ' - write_script reword-editor.sh <<-\EOS && - GIT_SEQUENCE_EDITOR="echo \"exec echo $(cat file) >>actual\" >>" \ - git rebase --edit-todo - EOS - - test_write_lines first third >expected && - set_fake_editor && - GIT_SEQUENCE_EDITOR="$EDITOR" FAKE_LINES="reword 1 squash 2 fixup 3" \ - GIT_EDITOR=./reword-editor.sh git rebase -i --root third && - test_cmp expected actual -' - -test_expect_success 're-reading todo doesnt interfere with revert --edit' ' - git reset --hard third && - - git revert --edit third second && - - cat >expect <<-\EOF && - Revert "second" - Revert "third" - third - second - first - EOF - git log --format="%s" >actual && - test_cmp expect actual -' - -test_expect_success 're-reading todo doesnt interfere with cherry-pick --edit' ' - git reset --hard first && - - git cherry-pick --edit second third && - - cat >expect <<-\EOF && - third - second - first - EOF - git log --format="%s" >actual && - test_cmp expect actual -' - test_done |