From: Kevin Daudt <me@ikke.info>
To: "Junio C. Hamano" <gitster@pobox.com>
Cc: Paul Tan <pyokagan@gmail.com>,
git@vger.kernel.org, Kevin daudt <me@ikke.info>,
Kevin Daudt <compufreak@gmail.com>
Subject: [PATCH v2 2/2] pull: allow dirty tree when rebase.autostash enabled
Date: Sat, 6 Jun 2015 23:12:25 +0200 [thread overview]
Message-ID: <1433625145-29668-2-git-send-email-me@ikke.info> (raw)
In-Reply-To: <1433625145-29668-1-git-send-email-me@ikke.info>
In-Reply-To: <1433282157-8171-1-git-send-email-me@ikke.info>
From: Kevin Daudt <compufreak@gmail.com>
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>
---
git-pull.sh | 5 ++++-
t/t5520-pull.sh | 12 ++++++++++++
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/git-pull.sh b/git-pull.sh
index 0917d0d..f0a3b6e 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 925ad49..d06119f 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -135,6 +135,18 @@ test_expect_success 'pull --rebase dies early with dirty working directory' '
test_cmp file expect
'
+test_expect_success 'pull --rebase succeeds with dirty working directory and rebase.autostash set' '
+ test_config branch.to-rebase.rebase true &&
+ test_config rebase.autostash true &&
+ git checkout HEAD -- file &&
+ echo dirty > new_file &&
+ git add new_file &&
+ git pull . copy &&
+ test $(git rev-parse HEAD^) = $(git rev-parse 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.4.2
next prev parent reply other threads:[~2015-06-06 21:12 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 ` Kevin Daudt [this message]
2015-06-11 13:34 ` [PATCH v2 2/2] pull: allow dirty tree when rebase.autostash enabled 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 ` [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=1433625145-29668-2-git-send-email-me@ikke.info \
--to=me@ikke.info \
--cc=compufreak@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pyokagan@gmail.com \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.