diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-08-17 15:07:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-17 15:07:50 -0700 |
| commit | e69b40828070b71c423820d1e35d5fb1e5b1a550 (patch) | |
| tree | f6cb843ebe7caa8b57074cf41ab5d4fdcf6270c8 /t | |
| parent | Second batch for 2.6 (diff) | |
| parent | pull: allow dirty tree when rebase.autostash enabled (diff) | |
| download | tgif-e69b40828070b71c423820d1e35d5fb1e5b1a550.tar.xz | |
Merge branch 'kd/pull-rebase-autostash'
"git pull --rebase" has been taught to pay attention to
rebase.autostash configuration.
* kd/pull-rebase-autostash:
pull: allow dirty tree when rebase.autostash enabled
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5520-pull.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh index f4a7193677..a0013ee32f 100755 --- a/t/t5520-pull.sh +++ b/t/t5520-pull.sh @@ -245,6 +245,17 @@ test_expect_success '--rebase fails with multiple branches' ' test modified = "$(git show HEAD:file)" ' +test_expect_success 'pull --rebase succeeds with dirty working directory and rebase.autostash set' ' + test_config rebase.autostash true && + git reset --hard before-rebase && + echo dirty >new_file && + git add new_file && + git pull --rebase . copy && + test_cmp_rev HEAD^ copy && + test "$(cat new_file)" = dirty && + test "$(cat file)" = "modified again" +' + test_expect_success 'pull.rebase' ' git reset --hard before-rebase && test_config pull.rebase true && |