From: Paul Tan <pyokagan@gmail.com>
To: Kevin Daudt <me@ikke.info>
Cc: "Junio C. Hamano" <gitster@pobox.com>, Git List <git@vger.kernel.org>
Subject: Re: [PATCH] pull: allow dirty tree when rebase.autostash enabled
Date: Wed, 3 Jun 2015 12:50:03 +0800 [thread overview]
Message-ID: <CACRoPnQ=5sdWpnebv0OKPHPBh4iyMZ1H47cix6KFh7i5fYomNA@mail.gmail.com> (raw)
In-Reply-To: <1433282157-8171-1-git-send-email-me@ikke.info>
Hi,
Some comments which may not necessarily be correct.
On Wed, Jun 3, 2015 at 5:55 AM, Kevin Daudt <me@ikke.info> wrote:
> 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.
> ---
Missing sign-off.
> 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" ]
"false" doesn't need to be quoted.
> + 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' '
> +
I know the surrounding old tests use a newline, but I think that all
new tests should use the modern style of not having a newline, since
t5520 already consists of a mix of old and modern styles anyway.
> + test_when_finished "git rm -f file4" &&
There is trailing whitespace here.
Furthermore, git rm -f will fail if "file4" does not exist in the
index. Perhaps it should be moved below the "git add" below.
> + git checkout to-rebase &&
> + git update-ref refs/remotes/me/copy copy^ &&
> + COPY=$(git rev-parse --verify me/copy) &&
$COPY is not used anywhere in the test.
> + 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 &&
file4 does not exist, so we don't need to append to it. I know the
above few tests do not adhere to it, but CodingGuidelines says that
redirection operators do not have a space after
> + git add file4 &&
> + git pull
I think we should check for file contents to ensure that
git-pull/git-stash/git-rebase is doing its job properly.
> +
Same as above, no need the newline.
> +'
> +
With all that said, I wonder if this test, and the test above ("pull
--rebase dies early with dirty working directory") could be vastly
simplified, since we are not testing if we can handle a rebased
upstream.
E.g., my simplified version for the above test would be something like:
git checkout -f to-rebase &&
git rebase --onto copy^ copy &&
test_config rebase.autostash true &&
echo dirty >file4 &&
git add file4 &&
test_when_finished "git rm -f file4" &&
git pull --rebase . me/copy &&
test "$(cat file4)" = dirty &&
test "$(cat file2)" = file
It's still confusing though, because we cannot take advantage of the
'before-rebase' tag introduced in the above tests. I would much prefer
if this test and the ("pull --rebase dies with dirty working
directory") test could be moved to the --rebase tests at lines 214+.
Also, this section in the t5520 test suite always gives me a headache
trying to decipher what it is trying to do ><
Thanks,
Paul
next prev parent reply other threads:[~2015-06-03 4:50 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 [this message]
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 ` [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='CACRoPnQ=5sdWpnebv0OKPHPBh4iyMZ1H47cix6KFh7i5fYomNA@mail.gmail.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.
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.