Re: [PATCH 3/3] pull: introduce --[no-]autostash and pull.autostash

From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Apr 16, 2013, 11:22 UTC
Message-ID: <vpqa9oyd8k2.fsf@grenoble-inp.fr>
In-Reply-To: <vpqppxudaor.fsf@grenoble-inp.fr>

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

Show 9 quoted lines

> Ramkumar Ramachandra <artagnon@gmail.com> writes:
>
>> Yes, touching a simple "autostash" file at stash-time, and removing it
>> at pop-time will do.  I don't see why it should be part of a
>> (potentially user-editable) todo-list, which serves an entirely
>> different purpose.
>
> You'll have to apply the index state and then the tree state. How do you
> know whether the next call to "git rebase" should apply one or the other?

Plus: what happens if the user ran "git stash" during rebase? In Junio's
version, the right commits are applied. Running blindly "stash pop" may
pop the wrong stash.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/