diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-05-01 05:14:44 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-01 05:14:44 (GMT) |
| commit | 0998b648d6addfb7eaf17e1aa4e7fb1dbefac548 (patch) | |
| tree | 80376d1e5a944d055086022cfb99d67bbc7c0835 /t | |
| parent | 3c0a7b9d6b94ba86db2015445d0963a3fae932dc (diff) | |
| parent | 54fd3243daec7d59394f25846450d83c0012e57c (diff) | |
| download | git-0998b648d6addfb7eaf17e1aa4e7fb1dbefac548.zip git-0998b648d6addfb7eaf17e1aa4e7fb1dbefac548.tar.gz git-0998b648d6addfb7eaf17e1aa4e7fb1dbefac548.tar.bz2 | |
Merge branch 'sh/rebase-i-reread-todo-after-exec'
"git rebase -i" failed to re-read the todo list file when the
command specified with the `exec` instruction updated it.
* sh/rebase-i-reread-todo-after-exec:
rebase -i: reread the todo list if `exec` touched it
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3429-rebase-edit-todo.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t3429-rebase-edit-todo.sh b/t/t3429-rebase-edit-todo.sh new file mode 100755 index 0000000..b9292df --- /dev/null +++ b/t/t3429-rebase-edit-todo.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +test_description='rebase should reread the todo file if an exec modifies it' + +. ./test-lib.sh + +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_done |