All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Cc: Karen Etheridge <ether@cpan.org>,
	Ramkumar Ramachandra <artagnon@gmail.com>,
	git@vger.kernel.org
Subject: Re: bug: autostash is lost after aborted rebase
Date: Tue, 20 May 2014 10:34:36 -0700	[thread overview]
Message-ID: <xmqqegzo1hhv.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <vpqlhtym8lp.fsf@anie.imag.fr> (Matthieu Moy's message of "Mon, 19 May 2014 11:16:34 +0200")

Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:

> [ Cc-ing Ramkumar ]
>
> Karen Etheridge <ether@cpan.org> writes:
>
>> scenario: 
>> - edit some tracked files; do not add them to the index
>> - "git config rebase.autostash true"
>> - "git rebase -i HEAD~3" (an autostash will be created)
>> - delete the entire buffer and save/exit the editor - this will abort the
>>   rebase
>>
>> poof, the autostash is gone (it is not reapplied) -- it must be explicitly
>> applied again via the SHA that was printed earlier.
>
> Indeed. Confirmed, even with pu (I thought I remembered seeing a fix on
> the list, but I must have mixed up with something else).

Thanks.  I see Ram's patch to address this on the list.  Will pick
it up and queue for post-release, as this is a fairly old breakage
dating as far back as v1.8.4, if I am not mistaken.

  reply	other threads:[~2014-05-20 17:34 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-19  0:57 bug: autostash is lost after aborted rebase Karen Etheridge
2014-05-19  1:38 ` Felipe Contreras
     [not found] ` <CAGK7Mr532G+OSXLf4HAbWoJxV2fOvxnVQXC4nV9ciPsU4JR5bA@mail.gmail.com>
2014-05-19  7:40   ` Philippe Vaucher
2014-05-19  9:16 ` Matthieu Moy
2014-05-20 17:34   ` Junio C Hamano [this message]
2016-05-16 21:23     ` Eugene Yarmash

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=xmqqegzo1hhv.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox.com \
    --cc=Matthieu.Moy@grenoble-inp.fr \
    --cc=artagnon@gmail.com \
    --cc=ether@cpan.org \
    --cc=git@vger.kernel.org \
    /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.