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

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

[Ander Conselvan de Oliveira]

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(-)

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
-- 
2.4.3

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Chris Wilson]

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

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Tvrtko Ursulin]

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

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Ander Conselvan De Oliveira]

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

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Ville Syrjälä]

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.

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Jani Nikula]

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.


-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Ander Conselvan De Oliveira]

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

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Ville Syrjälä]

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.

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH maintainer-tools] dim: Replace git commit --amend from dim_apply with dimrc option

[Ander Conselvan de Oliveira]

Introduce DIM_POST_APPLY_ACTION to dimrc that allows the user to specify
a command to be run after a patch is applied. Use eval so enviroment
variables can be overriden with the option. For example:

DIM_POST_APPLY_ACTION="EDITOR=\"gedit -w\" git commit --amend"

Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
---
 dim          | 2 +-
 dimrc.sample | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dim b/dim
index db92c57..b7c7ef7 100755
--- a/dim
+++ b/dim
@@ -383,7 +383,7 @@ function dim_apply
 		commit_add_tag "Link" "http://patchwork.freedesktop.org/patch/msgid/$message_id"
 	fi
 
-	git commit --amend &
+	eval $DRY $DIM_POST_APPLY_ACTION
 }
 
 function magic_patch
diff --git a/dimrc.sample b/dimrc.sample
index 5687eaf..9f30cb2 100644
--- a/dimrc.sample
+++ b/dimrc.sample
@@ -21,3 +21,6 @@
 # Mail User Agent supporting a subset of mutt(1) command line options:
 # [-s subject] [-i file] [-c cc-addr] to-addr [...]
 #DIM_MUA=mutt
+
+# Command to run after dim apply
+#DIM_POST_APPLY_ACTION=git commit --amend
-- 
2.4.3

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Tvrtko Ursulin]

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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Ander Conselvan De Oliveira]

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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH maintainer-tools] dim: Replace git commit --amend from dim_apply with dimrc option

[Lukas Wunner]

Hi Ander,

On Fri, Nov 13, 2015 at 05:05:09PM +0200, Ander Conselvan de Oliveira wrote:
> Introduce DIM_POST_APPLY_ACTION to dimrc that allows the user to specify
> a command to be run after a patch is applied. Use eval so enviroment
> variables can be overriden with the option. For example:
> 
> DIM_POST_APPLY_ACTION="EDITOR=\"gedit -w\" git commit --amend"

So an attacker wishing to smuggle a backdoor into the Linux kernel
only needs to find a way to modify that environment variable on
an Intel developers' machine.

If dim is invoked with $EDITOR set, this should be inherited to
child processes anyway, so it seems unnecessary to call eval.

Just my 2 cents,

Lukas

> 
> Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
> ---
>  dim          | 2 +-
>  dimrc.sample | 3 +++
>  2 files changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/dim b/dim
> index db92c57..b7c7ef7 100755
> --- a/dim
> +++ b/dim
> @@ -383,7 +383,7 @@ function dim_apply
>  		commit_add_tag "Link" "http://patchwork.freedesktop.org/patch/msgid/$message_id"
>  	fi
>  
> -	git commit --amend &
> +	eval $DRY $DIM_POST_APPLY_ACTION
>  }
>  
>  function magic_patch
> diff --git a/dimrc.sample b/dimrc.sample
> index 5687eaf..9f30cb2 100644
> --- a/dimrc.sample
> +++ b/dimrc.sample
> @@ -21,3 +21,6 @@
>  # Mail User Agent supporting a subset of mutt(1) command line options:
>  # [-s subject] [-i file] [-c cc-addr] to-addr [...]
>  #DIM_MUA=mutt
> +
> +# Command to run after dim apply
> +#DIM_POST_APPLY_ACTION=git commit --amend
> -- 
> 2.4.3
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH maintainer-tools] dim: Replace git commit --amend from dim_apply with dimrc option

[Jani Nikula]

On Fri, 13 Nov 2015, Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> wrote:
> Introduce DIM_POST_APPLY_ACTION to dimrc that allows the user to specify
> a command to be run after a patch is applied. Use eval so enviroment
> variables can be overriden with the option. For example:
>
> DIM_POST_APPLY_ACTION="EDITOR=\"gedit -w\" git commit --amend"
>
> Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
> ---
>  dim          | 2 +-
>  dimrc.sample | 3 +++
>  2 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/dim b/dim
> index db92c57..b7c7ef7 100755
> --- a/dim
> +++ b/dim
> @@ -383,7 +383,7 @@ function dim_apply
>  		commit_add_tag "Link" "http://patchwork.freedesktop.org/patch/msgid/$message_id"
>  	fi
>  
> -	git commit --amend &
> +	eval $DRY $DIM_POST_APPLY_ACTION
>  }
>  
>  function magic_patch
> diff --git a/dimrc.sample b/dimrc.sample
> index 5687eaf..9f30cb2 100644
> --- a/dimrc.sample
> +++ b/dimrc.sample
> @@ -21,3 +21,6 @@
>  # Mail User Agent supporting a subset of mutt(1) command line options:
>  # [-s subject] [-i file] [-c cc-addr] to-addr [...]
>  #DIM_MUA=mutt
> +
> +# Command to run after dim apply
> +#DIM_POST_APPLY_ACTION=git commit --amend

There's a comment earlier that says "Defaults are in the comments
below." I'm fine with changing the default here.


-- 
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH v2 maintainer-tools] dim: Replace git commit --amend from dim_apply with dimrc option

[Ander Conselvan de Oliveira]

Introduce DIM_POST_APPLY_ACTION to dimrc that allows the user to specify
a command to be run after a patch is applied. Use eval so enviroment
variables can be overriden with the option. For example:

DIM_POST_APPLY_ACTION="EDITOR=\"gedit -w\" git commit --amend"

v2: Initialize variable with default value.
    Fix dimrc.sample to match default value.

Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
---
 dim          | 5 ++++-
 dimrc.sample | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/dim b/dim
index db92c57..78b3f30 100755
--- a/dim
+++ b/dim
@@ -65,6 +65,9 @@ DIM_DRM_UPSTREAM_REMOTE=${DIM_DRM_UPSTREAM_REMOTE:-airlied}
 # usage: $DIM_MUA [-s subject] [-i file] [-c cc-addr] to-addr [...]
 DIM_MUA=${DIM_MUA:-mutt}
 
+# command to run after dim apply
+DIM_POST_APPLY_ACTION=${DIM_POST_APPLY_ACTION:-}
+
 # greetings pull request template
 DIM_TEMPLATE_HELLO=${DIM_TEMPLATE_HELLO:-$HOME/.dim.template.hello}
 
@@ -383,7 +386,7 @@ function dim_apply
 		commit_add_tag "Link" "http://patchwork.freedesktop.org/patch/msgid/$message_id"
 	fi
 
-	git commit --amend &
+	eval $DRY $DIM_POST_APPLY_ACTION
 }
 
 function magic_patch
diff --git a/dimrc.sample b/dimrc.sample
index 5687eaf..ad463b4 100644
--- a/dimrc.sample
+++ b/dimrc.sample
@@ -21,3 +21,6 @@
 # Mail User Agent supporting a subset of mutt(1) command line options:
 # [-s subject] [-i file] [-c cc-addr] to-addr [...]
 #DIM_MUA=mutt
+
+# Command to run after dim apply
+#DIM_POST_APPLY_ACTION=
-- 
2.4.3

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

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

[Daniel Vetter]

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
-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH v2 maintainer-tools] dim: Replace git commit --amend from dim_apply with dimrc option

[Daniel Vetter]

On Mon, Nov 16, 2015 at 12:17:15PM +0200, Ander Conselvan de Oliveira wrote:
> Introduce DIM_POST_APPLY_ACTION to dimrc that allows the user to specify
> a command to be run after a patch is applied. Use eval so enviroment
> variables can be overriden with the option. For example:
> 
> DIM_POST_APPLY_ACTION="EDITOR=\"gedit -w\" git commit --amend"
> 
> v2: Initialize variable with default value.
>     Fix dimrc.sample to match default value.
> 
> Signed-off-by: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>

Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

> ---
>  dim          | 5 ++++-
>  dimrc.sample | 3 +++
>  2 files changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/dim b/dim
> index db92c57..78b3f30 100755
> --- a/dim
> +++ b/dim
> @@ -65,6 +65,9 @@ DIM_DRM_UPSTREAM_REMOTE=${DIM_DRM_UPSTREAM_REMOTE:-airlied}
>  # usage: $DIM_MUA [-s subject] [-i file] [-c cc-addr] to-addr [...]
>  DIM_MUA=${DIM_MUA:-mutt}
>  
> +# command to run after dim apply
> +DIM_POST_APPLY_ACTION=${DIM_POST_APPLY_ACTION:-}
> +
>  # greetings pull request template
>  DIM_TEMPLATE_HELLO=${DIM_TEMPLATE_HELLO:-$HOME/.dim.template.hello}
>  
> @@ -383,7 +386,7 @@ function dim_apply
>  		commit_add_tag "Link" "http://patchwork.freedesktop.org/patch/msgid/$message_id"
>  	fi
>  
> -	git commit --amend &
> +	eval $DRY $DIM_POST_APPLY_ACTION
>  }
>  
>  function magic_patch
> diff --git a/dimrc.sample b/dimrc.sample
> index 5687eaf..ad463b4 100644
> --- a/dimrc.sample
> +++ b/dimrc.sample
> @@ -21,3 +21,6 @@
>  # Mail User Agent supporting a subset of mutt(1) command line options:
>  # [-s subject] [-i file] [-c cc-addr] to-addr [...]
>  #DIM_MUA=mutt
> +
> +# Command to run after dim apply
> +#DIM_POST_APPLY_ACTION=
> -- 
> 2.4.3
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH v2 maintainer-tools] dim: Replace git commit --amend from dim_apply with dimrc option

[Ander Conselvan De Oliveira]

On Wed, 2015-11-18 at 16:52 +0100, Daniel Vetter wrote:
> On Mon, Nov 16, 2015 at 12:17:15PM +0200, Ander Conselvan de Oliveira wrote:
> > Introduce DIM_POST_APPLY_ACTION to dimrc that allows the user to specify
> > a command to be run after a patch is applied. Use eval so enviroment
> > variables can be overriden with the option. For example:
> > 
> > DIM_POST_APPLY_ACTION="EDITOR=\"gedit -w\" git commit --amend"
> > 
> > v2: Initialize variable with default value.
> >     Fix dimrc.sample to match default value.
> > 
> > Signed-off-by: Ander Conselvan de Oliveira <
> > ander.conselvan.de.oliveira@intel.com>
> 
> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Thanks. Patch pushed.

Ander

> 
> > ---
> >  dim          | 5 ++++-
> >  dimrc.sample | 3 +++
> >  2 files changed, 7 insertions(+), 1 deletion(-)
> > 
> > diff --git a/dim b/dim
> > index db92c57..78b3f30 100755
> > --- a/dim
> > +++ b/dim
> > @@ -65,6 +65,9 @@ DIM_DRM_UPSTREAM_REMOTE=${DIM_DRM_UPSTREAM_REMOTE:
> > -airlied}
> >  # usage: $DIM_MUA [-s subject] [-i file] [-c cc-addr] to-addr [...]
> >  DIM_MUA=${DIM_MUA:-mutt}
> >  
> > +# command to run after dim apply
> > +DIM_POST_APPLY_ACTION=${DIM_POST_APPLY_ACTION:-}
> > +
> >  # greetings pull request template
> >  DIM_TEMPLATE_HELLO=${DIM_TEMPLATE_HELLO:-$HOME/.dim.template.hello}
> >  
> > @@ -383,7 +386,7 @@ function dim_apply
> >  		commit_add_tag "Link" "
> > http://patchwork.freedesktop.org/patch/msgid/$message_id"
> >  	fi
> >  
> > -	git commit --amend &
> > +	eval $DRY $DIM_POST_APPLY_ACTION
> >  }
> >  
> >  function magic_patch
> > diff --git a/dimrc.sample b/dimrc.sample
> > index 5687eaf..ad463b4 100644
> > --- a/dimrc.sample
> > +++ b/dimrc.sample
> > @@ -21,3 +21,6 @@
> >  # Mail User Agent supporting a subset of mutt(1) command line options:
> >  # [-s subject] [-i file] [-c cc-addr] to-addr [...]
> >  #DIM_MUA=mutt
> > +
> > +# Command to run after dim apply
> > +#DIM_POST_APPLY_ACTION=
> > -- 
> > 2.4.3
> > 
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

✗ Fi.CI.BAT: failure for dim: Remove git commit --amend from dim_apply

[Patchwork]

== Series Details ==

Series: dim: Remove git commit --amend from dim_apply
URL   : https://patchwork.freedesktop.org/series/738/
State : failure

== Summary ==

Patch is empty.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx