| Message ID | 1447416339-11419-1-git-send-email-ander.conselvan.de.oliveira@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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@intel.com> Presumable the ammend is there for a good reason and removing it keeps the state dirty? So maybe --amend --no-edit? -Chris
On 13/11/15 12:16, 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@intel.com> > > Presumable the ammend is there for a good reason and removing it keeps > the state dirty? So maybe --amend --no-edit? In either case can also consider "test -t 0" which is like isatty(0). Regards, Tvrtko
On Fri, 2015-11-13 at 12:16 +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@intel.com> > > Presumable the ammend is there for a good reason and removing it keeps > the state dirty? So maybe --amend --no-edit? I'm fine with that, but I'd like to have a definitive answer to the question before I resend. Maybe Daniel knows? Ander
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@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.
On Fri, 13 Nov 2015, Ville Syrjälä <ville.syrjala@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@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. BR, Jani.
On Fri, 2015-11-13 at 12:31 +0000, Tvrtko Ursulin wrote: > On 13/11/15 12:16, 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@intel.com> > > > > Presumable the ammend is there for a good reason and removing it keeps > > the state dirty? So maybe --amend --no-edit? > > In either case can also consider "test -t 0" which is like isatty(0). I think that will always evaluate to false since you are supposed to cat the mbox to dim apply. Ander
On Fri, Nov 13, 2015 at 04:33:50PM +0200, Jani Nikula wrote: > On Fri, 13 Nov 2015, Ville Syrjälä <ville.syrjala@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@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.
On 13/11/15 14:40, Ander Conselvan De Oliveira wrote: > On Fri, 2015-11-13 at 12:31 +0000, Tvrtko Ursulin wrote: >> On 13/11/15 12:16, 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@intel.com> >>> >>> Presumable the ammend is there for a good reason and removing it keeps >>> the state dirty? So maybe --amend --no-edit? >> >> In either case can also consider "test -t 0" which is like isatty(0). > > I think that will always evaluate to false since you are supposed to cat the > mbox to dim apply. Question is then how does it work for Daniel. :) Regards, Tvrtko
On Fri, 2015-11-13 at 15:07 +0000, Tvrtko Ursulin wrote: > On 13/11/15 14:40, Ander Conselvan De Oliveira wrote: > > On Fri, 2015-11-13 at 12:31 +0000, Tvrtko Ursulin wrote: > > > On 13/11/15 12:16, 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@intel.com> > > > > > > > > Presumable the ammend is there for a good reason and removing it keeps > > > > the state dirty? So maybe --amend --no-edit? > > > > > > In either case can also consider "test -t 0" which is like isatty(0). > > > > I think that will always evaluate to false since you are supposed to cat the > > mbox to dim apply. > > Question is then how does it work for Daniel. :) If I understood correctly he uses gvim, which doesn't run on a terminal. Ander
On Fri, Nov 13, 2015 at 05:11:58PM +0200, Ander Conselvan De Oliveira wrote: > On Fri, 2015-11-13 at 15:07 +0000, Tvrtko Ursulin wrote: > > On 13/11/15 14:40, Ander Conselvan De Oliveira wrote: > > > On Fri, 2015-11-13 at 12:31 +0000, Tvrtko Ursulin wrote: > > > > On 13/11/15 12:16, 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@intel.com> > > > > > > > > > > Presumable the ammend is there for a good reason and removing it keeps > > > > > the state dirty? So maybe --amend --no-edit? > > > > > > > > In either case can also consider "test -t 0" which is like isatty(0). > > > > > > I think that will always evaluate to false since you are supposed to cat the > > > mbox to dim apply. > > > > Question is then how does it work for Daniel. :) > > If I understood correctly he uses gvim, which doesn't run on a terminal. Yup. And I use git commit --amend to paste in all the r-b/t-b tags and all that stuff. Maybe we need a DIM_POST_APPLY_CMD in .dimrc? -Daniel
diff --git a/dim b/dim index db92c57..893906b 100755 --- a/dim +++ b/dim @@ -382,8 +382,6 @@ function dim_apply if [ -n $message_id ]; then commit_add_tag "Link" "http://patchwork.freedesktop.org/patch/msgid/$message_id" fi - - git commit --amend & } function magic_patch
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@intel.com> --- dim | 2 -- 1 file changed, 2 deletions(-)