From: Paul Tan <pyokagan@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Kevin Daudt <me@ikke.info>, git@vger.kernel.org
Subject: [PATCH v5] pull: allow dirty tree when rebase.autostash enabled
Date: Tue, 7 Jul 2015 11:59:56 +0800 [thread overview]
Message-ID: <20150707035956.GA6105@yoshi.chippynet.com> (raw)
In-Reply-To: <xmqqd205yq98.fsf@gitster.dls.corp.google.com>
On Mon, Jul 06, 2015 at 01:39:47PM -0700, Junio C Hamano wrote:
> 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).
Yeah, sorry about that.
Here's a modified patch for the C code.
Regards,
Paul
--- >8 ---
From: Kevin Daudt <me@ikke.info>
Date: Sat, 4 Jul 2015 23:42:38 +0200
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>
Signed-off-by: Paul Tan <pyokagan@gmail.com>
---
builtin/pull.c | 6 +++++-
t/t5520-pull.sh | 11 +++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/builtin/pull.c b/builtin/pull.c
index 722a83c..b7bc1ff 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -823,10 +823,14 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
hashclr(orig_head);
if (opt_rebase) {
+ int autostash = 0;
+
if (is_null_sha1(orig_head) && !is_cache_unborn())
die(_("Updating an unborn branch with changes added to the index."));
- die_on_unclean_work_tree(prefix);
+ git_config_get_bool("rebase.autostash", &autostash);
+ if (!autostash)
+ die_on_unclean_work_tree(prefix);
if (get_rebase_fork_point(rebase_fork_point, repo, *refspecs))
hashclr(rebase_fork_point);
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 &&
--
2.5.0.rc1.21.gbd65f2d.dirty
next prev parent reply other threads:[~2015-07-07 4:00 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
2015-07-07 3:59 ` Paul Tan [this message]
2015-07-22 19:07 ` [PATCH v5] " 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150707035956.GA6105@yoshi.chippynet.com \
--to=pyokagan@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=me@ikke.info \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).