[PATCH v2] qf: silence quilt refresh a little bit
Lucas De Marchi
lucas.demarchi at intel.com
Sat Mar 31 02:10:27 UTC 2018
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 at intel.com>
---
qf | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/qf b/qf
index 4c8a0e9ecc16..1d61b2ad7692 100755
--- a/qf
+++ b/qf
@@ -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
}
--
2.14.3
More information about the dim-tools
mailing list