diff options
author | Lucas De Marchi <lucas.demarchi@intel.com> | 2018-03-30 19:10:27 -0700 |
---|---|---|
committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2018-04-04 09:42:03 -0700 |
commit | fe1e542b17adb712ffb7ccb8f9a11ae10e7a1424 (patch) | |
tree | 6ff25c3cfc3d95189b0553b18365de8789c4c8a3 | |
parent | feb02b10efdc681f99c60c589d66a88885634b7d (diff) |
qf: silence quilt refresh a little bit
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.
v2: add unified helper
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
-rwxr-xr-x | qf | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -189,6 +189,10 @@ function quilt_clean_check fi } +function quilt_refresh { + quilt refresh --no-timestamps -u -p ab --no-index +} + qf=$(basename $0) # first positional argument is the subcommand @@ -293,7 +297,7 @@ function qf_refresh quiet_pop_all while quilt push ; do - quilt refresh + quilt_refresh done # ignore "nothing to commit" @@ -482,7 +486,7 @@ function qf_wiggle_push function qf_resolved { - quilt refresh + quilt_refresh quilt header -e } |