Re: stgit: lost all my patches again

From: Karl Hasselström <kha@treskal.com>
Date: Nov 28, 2007, 17:19 UTC
Message-ID: <20071128171917.GA21310@diana.vm.bytemark.co.uk>
In-Reply-To: <9e4733910711280858j5d03b3acleac0ece7b0a67f66@mail.gmail.com>

On 2007-11-28 11:58:14 -0500, Jon Smirl wrote:

> After someone runs the wrong command their first instinct will be to
> run stg repair. Can stg repair be made smart enough to not attempt a
> repair if it is unable to do so and print a message referring people
> back to the manual on how to move the head back?

Well, the thing is, it's never unable to repair.

However, I could add another repair mode: reset the branch head to the latest point in the reflog where it was consistent with StGit's metadata.

repair would have two flags to select the original or this new repair mode, and if the user doesn't give either flag, repair points out that she has two choices, and what they mean:

  "If you want to undo the last 3 git commands

     pull : Fast forward
     commit (amend): fix
     reset --hard kha/experimental: updating HEAD

   call stg repair --undo. If you want StGit to adjust to the new
   situation, call stg repair --assimilate."

> When I ran stg repair after the wrong git rebase command, I
> compounded the problem further.

Not that much. It was the push following the repair that killed you. The repair alone is totally benign; doing

  $ stg repair && git reset --hard foobar && stg repair

gives the same result as just

  $ git reset --hard foobar && stg repair

except for creating a few new patches that you can safely delete.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle