From: Peter Baumann <waste.manager@gmx.de>
Date: Wed, 08 Aug 2007 19:31:30 GMT
Subject: Re: [PATCH] Mod. gitk to support REBASE (with stash support).
Message-ID: <20070808193130.GC27470@xp.machine.xx>
In-Reply-To: <1186598028457-git-send-email-alexandre.bourget@savoirfairelinux.com>

On Wed, Aug 08, 2007 at 02:33:48PM -0400, Alexandre Bourget wrote:
> ---
> Adds a context menu for commits, so that a 'rebase' can be done.
> 
> Optionally, it will ask if you want to 'stash' current work before doing so.
> 
> TODO: better error handling.
> 
[...long patch ...]
> +    # TODO: error handling.
> +    exec git rebase $id
> +
> +    if {$confirm_ok} {
> +	exec git stash apply stash@{0}

'git stash apply' could fail with merge conflicts ...

> +	exec git stash clear

and here you are throwing the stash away!

> +    }
> +
> +    notbusy rebasehead
> +    updatecommits
> +}

-Peter