[PATCH] qf: silence quilt refresh a little bit

[Daniel Vetter]

On Thu, Mar 29, 2018 at 5:53 AM, Lucas De Marchi
<lucas.de.marchi at gmail.com> wrote:
> From: Lucas De Marchi <lucas.demarchi at intel.com>
>
> Since the patches are maintained in a git branch, if we keep refreshing
> we keep touching all patches with useless diff. Worse, it may change as
> each developer has a different configuration. Force a unified diff
> similar to git-diff in order to reduce the noise. Example:
>
> Before (where xxxxxxxxxxx is the name of the directory):
>  Index: xxxxxxxxxxx/drivers/gpu/drm/i915/intel_display.h
>  ===================================================================
> ---- xxxxxxxxxxx.orig/drivers/gpu/drm/i915/intel_display.h       2018-03-28 11:27:14.320823971 -0700
> -+++ xxxxxxxxxxx/drivers/gpu/drm/i915/intel_display.h    2018-03-28 11:27:14.312823952 -0700
> +--- xxxxxxxxxxx.orig/drivers/gpu/drm/i915/intel_display.h       2018-03-28 12:11:51.916788273 -0700
> ++++ xxxxxxxxxxx/drivers/gpu/drm/i915/intel_display.h    2018-03-28 12:11:51.916788273 -0700
>
> After:
>
>         ( Intentionally left blank )
>
> With this the files that need to be updated during a refresh of the
> entire pile reduces a lot.
>
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>

Maybe wrap it into a quilt_unified_refresh helper, in case someone
adds more places where we refresh? Maybe even as a qf refresh command
for developers?
-Daniel

> ---
>  qf | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/qf b/qf
> index 4c8a0e9ecc16..9018bff5749a 100755
> --- a/qf
> +++ b/qf
> @@ -293,7 +293,7 @@ function qf_refresh
>         quiet_pop_all
>
>         while quilt push ; do
> -               quilt refresh
> +               quilt refresh --no-timestamps -u -p ab --no-index
>         done
>
>         # ignore "nothing to commit"
> @@ -482,7 +482,7 @@ function qf_wiggle_push
>
>  function qf_resolved
>  {
> -       quilt refresh
> +       quilt refresh --no-timestamps -u -p ab --no-index
>         quilt header -e
>  }
>
> --
> 2.14.3
>
> _______________________________________________
> dim-tools mailing list
> dim-tools at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dim-tools



-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch