From: Junio C Hamano <gitster@pobox•com>
To: Kevin Daudt <me@ikke•info>
Cc: git@vger•kernel.org, Paul Tan <pyokagan@gmail•com>
Subject: Re: [PATCH v4] pull: allow dirty tree when rebase.autostash enabled
Date: Mon, 06 Jul 2015 13:39:47 -0700 [thread overview]
Message-ID: <xmqqd205yq98.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1436046158-19426-1-git-send-email-me@ikke.info> (Kevin Daudt's message of "Sat, 4 Jul 2015 23:42:38 +0200")
Kevin Daudt <me@ikke•info> writes:
> 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.
>
> Signed-off-by: Kevin Daudt <me@ikke•info>
> Helped-by: Paul Tan <pyokagan@gmail•com>
> ---
I applied it, tried to run today's integration cycle, and then ended
up ejecting it from my tree for now, as this seemed to break 5520
when merged to 'pu' X-<.
Well, that is partly expected, as Paul's builtin/pull.c does not
know about it (yet).
> git-pull.sh | 3 ++-
> t/t5520-pull.sh | 11 +++++++++++
> 2 files changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/git-pull.sh b/git-pull.sh
> index a814bf6..ff28d3f 100755
> --- a/git-pull.sh
> +++ b/git-pull.sh
> @@ -284,7 +284,8 @@ test true = "$rebase" && {
> then
> die "$(gettext "updating an unborn branch with changes added to the index")"
> fi
> - else
> + elif test $(git config --bool --get rebase.autostash || echo false) = false
> + then
> require_clean_work_tree "pull with rebase" "Please commit or stash them."
> fi
> oldremoteref= &&
> diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
> index f4a7193..a0013ee 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 &&
next prev parent reply other threads:[~2015-07-06 20:39 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-02 21:55 [PATCH] pull: allow dirty tree when rebase.autostash enabled Kevin Daudt
2015-06-03 4:50 ` Paul Tan
2015-06-06 21:12 ` [PATCH v2 1/2] t5520-pull: Simplify --rebase with dirty tree test Kevin Daudt
2015-06-11 13:20 ` Paul Tan
2015-06-06 21:12 ` [PATCH v2 2/2] pull: allow dirty tree when rebase.autostash enabled Kevin Daudt
2015-06-11 13:34 ` Paul Tan
2015-06-17 10:40 ` Kevin Daudt
2015-06-17 11:01 ` [PATCH v3] " Kevin Daudt
2015-06-17 15:36 ` Junio C Hamano
2015-07-04 21:00 ` kd/ Kevin Daudt
2015-07-04 21:42 ` [PATCH v4] pull: allow dirty tree when rebase.autostash enabled Kevin Daudt
2015-07-06 20:39 ` Junio C Hamano [this message]
2015-07-07 3:59 ` [PATCH v5] " Paul Tan
2015-07-22 19:07 ` Kevin Daudt
2015-07-22 19:42 ` Junio C Hamano
2015-07-22 20:48 ` Kevin Daudt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqd205yq98.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=me@ikke$(echo .)info \
--cc=pyokagan@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox