git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mehul Jain <mehul.jain2029@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>,
	Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
	Paul Tan <pyokagan@gmail.com>,
	Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH v4] pull --rebase: add --[no-]autostash flag
Date: Mon, 7 Mar 2016 13:53:46 +0530	[thread overview]
Message-ID: <CA+DCAeSD60jChusPviF-VNENVEfO0SoFkTZE-B-q+X_YcnuvFw@mail.gmail.com> (raw)
In-Reply-To: <xmqqfuw4x3e8.fsf@gitster.mtv.corp.google.com>

Hi Junio,

Thanks for the thorough review.

On Sat, Mar 5, 2016 at 10:34 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Is it worth checking the case where autostash kicks in, rebase
> itself is completed successfully, but the final "stash pop" fails in
> conflict?  I am thinking aloud and just wondering, not suggesting
> to add such a test, or even suggesting that having such a test is
> worthwhile. I didn't even check if there is already an existing test
> to cover that case.

I think this case has already been checked in t3420-rebase.autostash.sh:
"rebase$type: non-conflicting rebase, conflicting stash". Though in that
test rebase.autoStash has been used to trigger git-stash.

Thanks,
Mehul

  reply	other threads:[~2016-03-07  8:23 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-27 17:41 [PATCH v2 1/2] pull --rebase: add --[no-]autostash flag Mehul Jain
2016-02-27 17:41 ` [PATCH v2 2/2] Documentation/git-pull.txt: teach 'git pull --rebase' the --[no-]autostash option Mehul Jain
2016-02-27 19:26 ` [PATCH v2 1/2] pull --rebase: add --[no-]autostash flag Junio C Hamano
2016-02-28  9:51   ` Mehul Jain
2016-02-28 10:12     ` Matthieu Moy
2016-02-28 12:28   ` Paul Tan
2016-02-28 19:39     ` Junio C Hamano
2016-03-03 16:13 ` [PATCH v3 1/3] " Mehul Jain
2016-03-03 16:13   ` [PATCH v3 2/3] test: add test for " Mehul Jain
2016-03-03 17:31     ` Matthieu Moy
2016-03-04  5:43       ` Mehul Jain
2016-03-03 16:13   ` [PATCH v3 3/3] Documentation/git-pull: document --[no-]autostash option Mehul Jain
2016-03-03 17:14     ` Junio C Hamano
2016-03-04  5:04       ` Mehul Jain
2016-03-04  7:00         ` Matthieu Moy
2016-03-04 15:56     ` Paul Tan
2016-03-03 17:24   ` [PATCH v3 1/3] pull --rebase: add --[no-]autostash flag Matthieu Moy
2016-03-04  1:01     ` Eric Sunshine
2016-03-04  6:50       ` Matthieu Moy
2016-03-04  5:37     ` Mehul Jain
2016-03-04  6:51       ` Matthieu Moy
2016-03-04 15:52   ` Paul Tan
2016-03-05  9:52 ` [PATCH v4] " Mehul Jain
2016-03-05 12:26   ` Mehul Jain
2016-03-05 17:04   ` Junio C Hamano
2016-03-07  8:23     ` Mehul Jain [this message]
2016-03-07 12:37 ` [PATCH v5] " Mehul Jain
2016-03-07 23:01   ` Junio C Hamano
2016-03-08 18:19 ` [PATCH v6 1/2] git-pull.c: introduce git_pull_config() Mehul Jain
2016-03-08 18:19   ` [PATCH v6 2/2] pull --rebase: add --[no-]autostash flag Mehul Jain
2016-03-09  4:18 ` [PATCH v7 1/2] git-pull.c: introduce git_pull_config() Mehul Jain
2016-03-09  4:18   ` [PATCH v7 2/2] pull --rebase: add --[no-]autostash flag Mehul Jain
2016-03-11  4:51     ` Paul Tan
2016-03-11 13:15       ` Mehul Jain
2016-03-11 13:30         ` Matthieu Moy
2016-03-11 14:38           ` Mehul Jain
2016-03-12  6:49       ` Mehul Jain
2016-03-15 17:11 ` [PATCH 1/2] git-pull.c: introduce git_pull_config() Mehul Jain
2016-03-15 17:11   ` [PATCH 2/2] pull --rebase: add --[no-]autostash flag Mehul Jain
2016-03-15 21:43     ` Eric Sunshine
2016-03-16  5:00       ` Mehul Jain
2016-03-18  3:32         ` Eric Sunshine
2016-03-17  8:17       ` Mehul Jain
2016-03-18  3:53         ` Eric Sunshine

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=CA+DCAeSD60jChusPviF-VNENVEfO0SoFkTZE-B-q+X_YcnuvFw@mail.gmail.com \
    --to=mehul.jain2029@gmail.com \
    --cc=Matthieu.Moy@grenoble-inp.fr \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=pyokagan@gmail.com \
    --cc=sunshine@sunshineco.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 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 NNTP newsgroup(s).