Re: [PATCH RFC] gitk: Allow commit editing

From: Jeff King <peff@peff.net>
Date: Aug 18, 2011, 22:33 UTC
Message-ID: <20110818223346.GA8481@sigill.intra.peff.net>
In-Reply-To: <1313610971-1741-1-git-send-email-sojka@os.inf.tu-dresden.de>

On Wed, Aug 17, 2011 at 09:56:11PM +0200, Michal Sojka wrote:

Show 7 quoted lines

> Hi, this is a proof of concept patch that allows editing of commits
> from gitk. I often review patches before pushing in gitk and if I
> would like to have an easy way of fixing typos in commit messages etc.
> 
> So the patch adds "Edit this commit" item to gitk's context menu and
> the actual editing is done by non-interactively invoking interactive
> rebase :-) and git gui.

Invoking rebase behind the scenes makes me very nervous. In particular:

  1. There is nothing to indicate to the user that they are rewriting a
     string of commits, which is going to wreak havoc if any of the
     commits have been published elsewhere (either pushed somewhere, or
     even present in another local branch). I.e., rebasing generally
     needs to be a conscious decision of the user.

     Yes, a veteran user who thinks about it will realize there is no
     way to edit an old commit without rebasing, but I suspect relying
     on that is not enough. There should probably be a prominent
     warning at least the first time somebody uses this feature.

  2. Even if you accept the hazard of rewriting commits, you don't pass
     "-p" to rebase. So it will linearize your history. I don't know how
     robust "-p" is these days, and if it's up to the challenge of
     people using it to rebase potentially large segments of complex
     history.

So I think your idea is sane, and if you use it appropriately (by editing commits in recent-ish linear stretches of history) your patch works fine. But I really worry that it is going to be a problem for less clueful users to stumble across in the menu.

-Peff