Re: stgit: lost all my patches again

From: Jon Smirl <jonsmirl@gmail.com>
Date: Nov 27, 2007, 23:12 UTC
Message-ID: <9e4733910711271512g790364e0ka4839b2be9fd4935@mail.gmail.com>
In-Reply-To: <9e4733910711271417l32ed9a77p9915aa34a780665b@mail.gmail.com>

On 11/27/07, Jon Smirl <jonsmirl@gmail.com> wrote:

Show 6 quoted lines

> My fingers are too trained in doing "git rebase linus/master" instead
> of "stg rebase linus/master". This has resulting in me losing my patch
> stack again. I updated stg to the current version and tried "stg
> repair"  put all my patches are still empty.
>
> What's the easiest way to recover?

I recovered, which wasn't too bad since I had exported the stack about an hour earlier. I played around trying to recover the tree for a while and then gave up and whacked it. I used my export and then I extracted the last hours worth of changes from the old tree.

As Jakub pointed out to me "git reset --hard $(cat .git/patches/<branch>/orig-base)" would have recovered from the rebase command. But I had already typed 'stg repair' which compounded the mess.

> Can we add a check in "git rebase" so that it will refuse to run if
> stg is active?

This is way too easy to do. One simple mistype of 'git' for 'stg' and you're in a mess.

-- 
Jon Smirl
jonsmirl@gmail.com