Re: [PATCH 1/2] pull: respect rebase.autostash
- From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
- Date
- Jun 14, 2013, 09:13 UTC
- Message-ID
- <vpqfvwlkqb5.fsf@anie.imag.fr>
- In-Reply-To
- <1371200178-9927-2-git-send-email-artagnon@gmail.com>
Ramkumar Ramachandra <artagnon@gmail.com> writes:
Show 16 quoted lines
> --- a/git-pull.sh
> +++ b/git-pull.sh
> @@ -44,6 +44,7 @@ merge_args= edit=
> curr_branch=$(git symbolic-ref -q HEAD)
> curr_branch_short="${curr_branch#refs/heads/}"
> rebase=$(git config --bool branch.$curr_branch_short.rebase)
> +autostash=$(git config --bool rebase.autostash)
> if test -z "$rebase"
> then
> rebase=$(git config --bool pull.rebase)
> @@ -203,6 +204,7 @@ test true = "$rebase" && {
> die "$(gettext "updating an unborn branch with changes added to the index")"
> fi
> else
> + test true = "$autostash" ||
> require_clean_work_tree "pull with rebase" "Please commit or stash them."Trivial, indeed!
It would be nice to have an --autostash command-line option too, and the error message in "require_clean_work_tree" could suggest using it. That would make the feature easily discoverable.
Perhaps this patch could mention "pull --rebase" in the doc, like (config.txt)
- ends. This means that you can run rebase on a dirty worktree. + ends. This means that you can run rebase or `git pull --rebase` on a dirty worktree.
(or perhaps it's obvious enough and not needed)
-- Matthieu Moy http://www-verimag.imag.fr/~moy/