diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-02 02:04:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-02 02:04:58 (GMT) |
| commit | b78c5fe96cadf10c49b968b716a913acf43cc28e (patch) | |
| tree | 2ba9f0199e97bbd1c591eb0f420ef139b5b087fd /t | |
| parent | 9d322282e4a5be1c908d73c8039f99cb9950f8f3 (diff) | |
| parent | ffae8b2f904f0a82417ac24cb2684bbe5ca234e1 (diff) | |
| download | git-b78c5fe96cadf10c49b968b716a913acf43cc28e.zip git-b78c5fe96cadf10c49b968b716a913acf43cc28e.tar.gz git-b78c5fe96cadf10c49b968b716a913acf43cc28e.tar.bz2 | |
Merge branch 'js/rebase-autostash-fix'
"git rebase" that has recently been rewritten in C had a few issues
in its "--autstash" feature, which have been corrected.
* js/rebase-autostash-fix:
rebase --autostash: fix issue with dirty submodules
rebase --autostash: demonstrate a problem with dirty submodules
rebase (autostash): use an explicit OID to apply the stash
rebase (autostash): store the full OID in <state-dir>/autostash
rebase (autostash): avoid duplicate call to state_dir_path()
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3420-rebase-autostash.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh index 0c4eefe..f355c68 100755 --- a/t/t3420-rebase-autostash.sh +++ b/t/t3420-rebase-autostash.sh @@ -351,4 +351,14 @@ test_expect_success 'autostash is saved on editor failure with conflict' ' test_cmp expected file0 ' +test_expect_success 'autostash with dirty submodules' ' + test_when_finished "git reset --hard && git checkout master" && + git checkout -b with-submodule && + git submodule add ./ sub && + test_tick && + git commit -m add-submodule && + echo changed >sub/file0 && + git rebase -i --autostash HEAD +' + test_done |