From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Aug 2015 22:07:50 +0000 (-0700)
Subject: Merge branch 'kd/pull-rebase-autostash'
X-Git-Tag: v2.6.0-rc0~70
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e69b40828070b71c423820d1e35d5fb1e5b1a550?ds=inline;hp=-c

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
---

e69b40828070b71c423820d1e35d5fb1e5b1a550
diff --combined t/t5520-pull.sh
index f4a7193677,f62c5b09b5..a0013ee32f
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@@ -86,19 -86,16 +86,19 @@@ test_expect_success 'pulling into void 
  '
  
  test_expect_success 'test . as a remote' '
 -
  	git branch copy master &&
  	git config branch.copy.remote . &&
  	git config branch.copy.merge refs/heads/master &&
  	echo updated >file &&
  	git commit -a -m updated &&
  	git checkout copy &&
 -	test `cat file` = file &&
 +	test "$(cat file)" = file &&
  	git pull &&
 -	test `cat file` = updated
 +	test "$(cat file)" = updated &&
 +	git reflog -1 >reflog.actual &&
 +	sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
 +	echo "OBJID HEAD@{0}: pull: Fast-forward" >reflog.expected &&
 +	test_cmp reflog.expected reflog.fuzzy
  '
  
  test_expect_success 'the default remote . should not break explicit pull' '
@@@ -107,120 -104,9 +107,120 @@@
  	git commit -a -m modified &&
  	git checkout copy &&
  	git reset --hard HEAD^ &&
 -	test `cat file` = file &&
 +	test "$(cat file)" = file &&
  	git pull . second &&
 -	test `cat file` = modified
 +	test "$(cat file)" = modified &&
 +	git reflog -1 >reflog.actual &&
 +	sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
 +	echo "OBJID HEAD@{0}: pull . second: Fast-forward" >reflog.expected &&
 +	test_cmp reflog.expected reflog.fuzzy
 +'
 +
 +test_expect_success 'fail if wildcard spec does not match any refs' '
 +	git checkout -b test copy^ &&
 +	test_when_finished "git checkout -f copy && git branch -D test" &&
 +	test "$(cat file)" = file &&
 +	test_must_fail git pull . "refs/nonexisting1/*:refs/nonexisting2/*" 2>err &&
 +	test_i18ngrep "no candidates for merging" err &&
 +	test "$(cat file)" = file
 +'
 +
 +test_expect_success 'fail if no branches specified with non-default remote' '
 +	git remote add test_remote . &&
 +	test_when_finished "git remote remove test_remote" &&
 +	git checkout -b test copy^ &&
 +	test_when_finished "git checkout -f copy && git branch -D test" &&
 +	test "$(cat file)" = file &&
 +	test_config branch.test.remote origin &&
 +	test_must_fail git pull test_remote 2>err &&
 +	test_i18ngrep "specify a branch on the command line" err &&
 +	test "$(cat file)" = file
 +'
 +
 +test_expect_success 'fail if not on a branch' '
 +	git remote add origin . &&
 +	test_when_finished "git remote remove origin" &&
 +	git checkout HEAD^ &&
 +	test_when_finished "git checkout -f copy" &&
 +	test "$(cat file)" = file &&
 +	test_must_fail git pull 2>err &&
 +	test_i18ngrep "not currently on a branch" err &&
 +	test "$(cat file)" = file
 +'
 +
 +test_expect_success 'fail if no configuration for current branch' '
 +	git remote add test_remote . &&
 +	test_when_finished "git remote remove test_remote" &&
 +	git checkout -b test copy^ &&
 +	test_when_finished "git checkout -f copy && git branch -D test" &&
 +	test_config branch.test.remote test_remote &&
 +	test "$(cat file)" = file &&
 +	test_must_fail git pull 2>err &&
 +	test_i18ngrep "no tracking information" err &&
 +	test "$(cat file)" = file
 +'
 +
 +test_expect_success 'pull --all: fail if no configuration for current branch' '
 +	git remote add test_remote . &&
 +	test_when_finished "git remote remove test_remote" &&
 +	git checkout -b test copy^ &&
 +	test_when_finished "git checkout -f copy && git branch -D test" &&
 +	test_config branch.test.remote test_remote &&
 +	test "$(cat file)" = file &&
 +	test_must_fail git pull --all 2>err &&
 +	test_i18ngrep "There is no tracking information" err &&
 +	test "$(cat file)" = file
 +'
 +
 +test_expect_success 'fail if upstream branch does not exist' '
 +	git checkout -b test copy^ &&
 +	test_when_finished "git checkout -f copy && git branch -D test" &&
 +	test_config branch.test.remote . &&
 +	test_config branch.test.merge refs/heads/nonexisting &&
 +	test "$(cat file)" = file &&
 +	test_must_fail git pull 2>err &&
 +	test_i18ngrep "no such ref was fetched" err &&
 +	test "$(cat file)" = file
 +'
 +
 +test_expect_success 'fail if the index has unresolved entries' '
 +	git checkout -b third second^ &&
 +	test_when_finished "git checkout -f copy && git branch -D third" &&
 +	test "$(cat file)" = file &&
 +	test_commit modified2 file &&
 +	test -z "$(git ls-files -u)" &&
 +	test_must_fail git pull . second &&
 +	test -n "$(git ls-files -u)" &&
 +	cp file expected &&
 +	test_must_fail git pull . second 2>err &&
 +	test_i18ngrep "Pull is not possible because you have unmerged files" err &&
 +	test_cmp expected file &&
 +	git add file &&
 +	test -z "$(git ls-files -u)" &&
 +	test_must_fail git pull . second 2>err &&
 +	test_i18ngrep "You have not concluded your merge" err &&
 +	test_cmp expected file
 +'
 +
 +test_expect_success 'fast-forwards working tree if branch head is updated' '
 +	git checkout -b third second^ &&
 +	test_when_finished "git checkout -f copy && git branch -D third" &&
 +	test "$(cat file)" = file &&
 +	git pull . second:third 2>err &&
 +	test_i18ngrep "fetch updated the current branch head" err &&
 +	test "$(cat file)" = modified &&
 +	test "$(git rev-parse third)" = "$(git rev-parse second)"
 +'
 +
 +test_expect_success 'fast-forward fails with conflicting work tree' '
 +	git checkout -b third second^ &&
 +	test_when_finished "git checkout -f copy && git branch -D third" &&
 +	test "$(cat file)" = file &&
 +	echo conflict >file &&
 +	test_must_fail git pull . second:third 2>err &&
 +	test_i18ngrep "Cannot fast-forward your working tree" err &&
 +	test "$(cat file)" = conflict &&
 +	test "$(git rev-parse third)" = "$(git rev-parse second)"
  '
  
  test_expect_success '--rebase' '
@@@ -233,32 -119,35 +233,43 @@@
  	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 &&
  	git pull . 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 'branch.to-rebase.rebase' '
  	git reset --hard before-rebase &&
  	test_config branch.to-rebase.rebase true &&
  	git pull . 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 'branch.to-rebase.rebase should override pull.rebase' '
@@@ -266,8 -155,8 +277,8 @@@
  	test_config pull.rebase true &&
  	test_config branch.to-rebase.rebase false &&
  	git pull . 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)"
  '
  
  # add a feature branch, keep-merge, that is merged into master, so the
@@@ -286,33 -175,33 +297,33 @@@ test_expect_success 'pull.rebase=false 
  	git reset --hard before-preserve-rebase &&
  	test_config pull.rebase false &&
  	git pull . copy &&
 -	test $(git rev-parse HEAD^1) = $(git rev-parse before-preserve-rebase) &&
 -	test $(git rev-parse HEAD^2) = $(git rev-parse copy) &&
 -	test file3 = $(git show HEAD:file3.t)
 +	test "$(git rev-parse HEAD^1)" = "$(git rev-parse before-preserve-rebase)" &&
 +	test "$(git rev-parse HEAD^2)" = "$(git rev-parse copy)" &&
 +	test file3 = "$(git show HEAD:file3.t)"
  '
  
  test_expect_success 'pull.rebase=true flattens keep-merge' '
  	git reset --hard before-preserve-rebase &&
  	test_config pull.rebase true &&
  	git pull . copy &&
 -	test $(git rev-parse HEAD^^) = $(git rev-parse copy) &&
 -	test file3 = $(git show HEAD:file3.t)
 +	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
 +	test file3 = "$(git show HEAD:file3.t)"
  '
  
  test_expect_success 'pull.rebase=1 is treated as true and flattens keep-merge' '
  	git reset --hard before-preserve-rebase &&
  	test_config pull.rebase 1 &&
  	git pull . copy &&
 -	test $(git rev-parse HEAD^^) = $(git rev-parse copy) &&
 -	test file3 = $(git show HEAD:file3.t)
 +	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
 +	test file3 = "$(git show HEAD:file3.t)"
  '
  
  test_expect_success 'pull.rebase=preserve rebases and merges keep-merge' '
  	git reset --hard before-preserve-rebase &&
  	test_config pull.rebase preserve &&
  	git pull . copy &&
 -	test $(git rev-parse HEAD^^) = $(git rev-parse copy) &&
 -	test $(git rev-parse HEAD^2) = $(git rev-parse keep-merge)
 +	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
 +	test "$(git rev-parse HEAD^2)" = "$(git rev-parse keep-merge)"
  '
  
  test_expect_success 'pull.rebase=invalid fails' '
@@@ -325,25 -214,25 +336,25 @@@ test_expect_success '--rebase=false cre
  	git reset --hard before-preserve-rebase &&
  	test_config pull.rebase true &&
  	git pull --rebase=false . copy &&
 -	test $(git rev-parse HEAD^1) = $(git rev-parse before-preserve-rebase) &&
 -	test $(git rev-parse HEAD^2) = $(git rev-parse copy) &&
 -	test file3 = $(git show HEAD:file3.t)
 +	test "$(git rev-parse HEAD^1)" = "$(git rev-parse before-preserve-rebase)" &&
 +	test "$(git rev-parse HEAD^2)" = "$(git rev-parse copy)" &&
 +	test file3 = "$(git show HEAD:file3.t)"
  '
  
  test_expect_success '--rebase=true rebases and flattens keep-merge' '
  	git reset --hard before-preserve-rebase &&
  	test_config pull.rebase preserve &&
  	git pull --rebase=true . copy &&
 -	test $(git rev-parse HEAD^^) = $(git rev-parse copy) &&
 -	test file3 = $(git show HEAD:file3.t)
 +	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
 +	test file3 = "$(git show HEAD:file3.t)"
  '
  
  test_expect_success '--rebase=preserve rebases and merges keep-merge' '
  	git reset --hard before-preserve-rebase &&
  	test_config pull.rebase true &&
  	git pull --rebase=preserve . copy &&
 -	test $(git rev-parse HEAD^^) = $(git rev-parse copy) &&
 -	test $(git rev-parse HEAD^2) = $(git rev-parse keep-merge)
 +	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
 +	test "$(git rev-parse HEAD^2)" = "$(git rev-parse keep-merge)"
  '
  
  test_expect_success '--rebase=invalid fails' '
@@@ -355,8 -244,8 +366,8 @@@ test_expect_success '--rebase override
  	git reset --hard before-preserve-rebase &&
  	test_config pull.rebase preserve &&
  	git pull --rebase . copy &&
 -	test $(git rev-parse HEAD^^) = $(git rev-parse copy) &&
 -	test file3 = $(git show HEAD:file3.t)
 +	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
 +	test file3 = "$(git show HEAD:file3.t)"
  '
  
  test_expect_success '--rebase with rebased upstream' '
@@@ -373,18 -262,10 +384,18 @@@
  	git tag to-rebase-orig &&
  	git pull --rebase me copy &&
  	test "conflicting modification" = "$(cat file)" &&
 -	test file = $(cat file2)
 +	test file = "$(cat file2)"
  
  '
  
 +test_expect_success '--rebase -f with rebased upstream' '
 +	test_when_finished "test_might_fail git rebase --abort" &&
 +	git reset --hard to-rebase-orig &&
 +	git pull --rebase -f me copy &&
 +	test "conflicting modification" = "$(cat file)" &&
 +	test file = "$(cat file2)"
 +'
 +
  test_expect_success '--rebase with rebased default upstream' '
  
  	git update-ref refs/remotes/me/copy copy-orig &&
@@@ -392,7 -273,7 +403,7 @@@
  	git reset --hard to-rebase-orig &&
  	git pull --rebase &&
  	test "conflicting modification" = "$(cat file)" &&
 -	test file = $(cat file2)
 +	test file = "$(cat file2)"
  
  '
  
@@@ -413,7 -294,7 +424,7 @@@ test_expect_success 'pull --rebase die
  
  	git checkout to-rebase &&
  	git update-ref refs/remotes/me/copy copy^ &&
 -	COPY=$(git rev-parse --verify me/copy) &&
 +	COPY="$(git rev-parse --verify me/copy)" &&
  	git rebase --onto $COPY copy &&
  	test_config branch.to-rebase.remote me &&
  	test_config branch.to-rebase.merge refs/heads/copy &&
@@@ -421,10 -302,10 +432,10 @@@
  	echo dirty >> file &&
  	git add file &&
  	test_must_fail git pull &&
 -	test $COPY = $(git rev-parse --verify me/copy) &&
 +	test "$COPY" = "$(git rev-parse --verify me/copy)" &&
  	git checkout HEAD -- file &&
  	git pull &&
 -	test $COPY != $(git rev-parse --verify me/copy)
 +	test "$COPY" != "$(git rev-parse --verify me/copy)"
  
  '
  
@@@ -439,21 -320,6 +450,21 @@@ test_expect_success 'pull --rebase work
  	test_cmp expect actual
  '
  
 +test_expect_success 'pull --rebase fails on unborn branch with staged changes' '
 +	test_when_finished "rm -rf empty_repo2" &&
 +	git init empty_repo2 &&
 +	(
 +		cd empty_repo2 &&
 +		echo staged-file >staged-file &&
 +		git add staged-file &&
 +		test "$(git ls-files)" = staged-file &&
 +		test_must_fail git pull --rebase .. master 2>err &&
 +		test "$(git ls-files)" = staged-file &&
 +		test "$(git show :staged-file)" = staged-file &&
 +		test_i18ngrep "unborn branch with changes added to the index" err
 +	)
 +'
 +
  test_expect_success 'setup for detecting upstreamed changes' '
  	mkdir src &&
  	(cd src &&