[PATCH 1/7] qf: Remove repo_check inside wiggle.

Lucas De Marchi lucas.de.marchi at gmail.com
Tue Jan 23 18:40:10 UTC 2018


On Mon, Jan 22, 2018 at 12:00:34PM -0800, Rodrigo Vivi wrote:
> For a long time I carried my own wiggle scripts
> here and I couldn't remember why exactly since
> they exist here on qf already.
> 
> Now that I'm trying to kill some of my own and
> internal helper I realized that it was because
> the extra check for repo at this level is annoying.
> 
> Let's be more permissive with wiggle magic here.
> 
> Cc: Paulo Zanoni <paulo.r.zanoni at intel.com>
> Cc: James Ausmus <james.ausmus at intel.com>
> Cc: Michel Thierry <michel.thierry at intel.com>
> Cc: Lucas De Marchi <lucas.demarchi at intel.com>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi at intel.com>

Reviewed-by: Lucas De Marchi <lucas.demarchi at intel.com>

> ---
>  qf | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/qf b/qf
> index cafbdc44e1bc..92fad9dc26ea 100755
> --- a/qf
> +++ b/qf
> @@ -437,7 +437,6 @@ qf_alias_wp=wiggle_push
>  function qf_wiggle_push
>  {
>  	cd_toplevel
> -	repo_check 1
>  
>  	conflict_files=$(quilt push -f | grep "saving rejects" | sed -e "s/.*saving rejects to file \(.*\)/\1/")
>  
> -- 
> 2.13.6
> 
> _______________________________________________
> dim-tools mailing list
> dim-tools at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dim-tools


More information about the dim-tools mailing list