[Intel-gfx] [PATCH maintainer-tools] dim: Remove git commit --amend from dim_apply

Ville Syrjälä ville.syrjala at linux.intel.com
Fri Nov 13 06:42:05 PST 2015


On Fri, Nov 13, 2015 at 04:33:50PM +0200, Jani Nikula wrote:
> On Fri, 13 Nov 2015, Ville Syrjälä <ville.syrjala at linux.intel.com> wrote:
> > On Fri, Nov 13, 2015 at 12:16:59PM +0000, Chris Wilson wrote:
> >> On Fri, Nov 13, 2015 at 02:05:39PM +0200, Ander Conselvan de Oliveira wrote:
> >> > Calling git --amend invokes the editor, which will not run if it relies
> >> > on the terminal for input. So don't do that from dim_apply.
> >> > 
> >> > Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira at intel.com>
> >> 
> >> Presumable the ammend is there for a good reason and removing it keeps
> >> the state dirty? So maybe --amend --no-edit?
> >
> > I don't think there's any reason other than Daniel's gvim workflow.
> 
> Yes, that's it, there's no functional reason other than to fire up an
> editor to edit the commit message (add r-b, etc.) This always fails for
> me and I just do this in the cli separately.
> 
> Basically three options, just remove it, add tty test suggested by
> Tvrtko, or add some DIM_POST_APPLY_ACTION configuration. I'm fine with
> any of them.

I don't want to amend the commit at this point in my workflow. "dim xt"
(should upstream that somehow one of these days...) is what I do after
"dim aq", so anything that fires up an editor is no good for me.

-- 
Ville Syrjälä
Intel OTC


More information about the Intel-gfx mailing list