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

diff --cc t/t5520-pull.sh
index f4a7193677a4861440d79e761f02315c790e275f,f62c5b09b5f04d2107cfa2bff58ea373c44fd7e3..a0013ee32f1940e32b4038d6cc9a39b218d794f1
--- 1/t/t5520-pull.sh
--- 2/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@@ -233,18 -119,21 +233,29 @@@ test_expect_success '--rebase' 
        git commit -m "new file" &&
        git tag before-rebase &&
        git pull --rebase . copy &&
 -      test $(git rev-parse HEAD^) = $(git rev-parse copy) &&
 -      test new = $(git show HEAD:file2)
 +      test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
 +      test new = "$(git show HEAD:file2)"
 +'
 +
 +test_expect_success '--rebase fails with multiple branches' '
 +      git reset --hard before-rebase &&
 +      test_must_fail git pull --rebase . copy master 2>err &&
 +      test "$(git rev-parse HEAD)" = "$(git rev-parse before-rebase)" &&
 +      test_i18ngrep "Cannot rebase onto multiple branches" err &&
 +      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 &&