diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-12-10 14:35:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-10 14:35:16 -0800 |
| commit | 3e1dbfa135cf131281aa92f159073dc892bac419 (patch) | |
| tree | f45146f6702e2809f61d75702f15246363502fe7 /t | |
| parent | Merge branch 'cb/add-p-single-key-fix' (diff) | |
| parent | sequencer: avoid adding exec commands for non-commit creating commands (diff) | |
| download | git-3e1dbfa135cf131281aa92f159073dc892bac419.tar.gz git-3e1dbfa135cf131281aa92f159073dc892bac419.zip | |
Merge branch 'en/rebase-x-fix'
"git rebase -x" added an unnecessary 'exec' instructions before
'noop', which has been corrected.
* en/rebase-x-fix:
sequencer: avoid adding exec commands for non-commit creating commands
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3429-rebase-edit-todo.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/t/t3429-rebase-edit-todo.sh b/t/t3429-rebase-edit-todo.sh index 7024d49ae7..abd66f3602 100755 --- a/t/t3429-rebase-edit-todo.sh +++ b/t/t3429-rebase-edit-todo.sh @@ -13,10 +13,15 @@ test_expect_success 'setup' ' test_expect_success 'rebase exec modifies rebase-todo' ' todo=.git/rebase-merge/git-rebase-todo && - git rebase HEAD -x "echo exec touch F >>$todo" && + git rebase HEAD~1 -x "echo exec touch F >>$todo" && test -e F ' +test_expect_success 'rebase exec with an empty list does not exec anything' ' + git rebase HEAD -x "true" 2>output && + ! grep "Executing: true" output +' + test_expect_success 'loose object cache vs re-reading todo list' ' GIT_REBASE_TODO=.git/rebase-merge/git-rebase-todo && export GIT_REBASE_TODO && |