rebase learned to stash changes when it encounters a dirty work tree, but
git pull --rebase does not.
Only verify if the working tree is dirty when rebase.autostash is not
enabled.
---
git-pull.sh | 5 ++++-
t/t5520-pull.sh | 17 +++++++++++++++++
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/git-pull.sh b/git-pull.sh
index 0917d0d..6b9e8a3 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -239,7 +239,10 @@ test true = "$rebase" && {
die "$(gettext "updating an unborn branch with changes
added to the index")"
fi
else
- require_clean_work_tree "pull with rebase" "Please commit or
stash them."
+ if [ $(git config --bool --get rebase.autostash || echo false)
= "false" ]
+ then
+ require_clean_work_tree "pull with rebase" "Please
commit or stash them."
+ fi
fi
oldremoteref= &&
test -n "$curr_branch" &&
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index 7efd45b..d849a19 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -297,6 +297,23 @@ test_expect_success 'pull --rebase dies early with dirty
working directory' '
'
+test_expect_success 'pull --rebase succeeds with dirty working directory and
rebase.autostash set' '
+
+ test_when_finished "git rm -f file4" &&
+ git checkout to-rebase &&
+ git update-ref refs/remotes/me/copy 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 &&
+ test_config branch.to-rebase.rebase true &&
+ test_config rebase.autostash true &&
+ echo dirty >> file4 &&
+ git add file4 &&
+ git pull
+
+'
+
test_expect_success 'pull --rebase works on branch yet to be born' '
git rev-parse master >expect &&
mkdir empty_repo &&
--
2.4.2
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
