Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2015-05-28 10:25:11 +0200
committerJiri Kosina <jkosina@suse.cz>2015-05-28 10:25:11 +0200
commitdc083eedd25349419b4cd0556b8d0cab4d86580f (patch)
tree8b668ac8312a1cc398b785ee409805fc92d53fad
parentb348f9bdc7a2a9a609b34424f398c9e3e3dbf281 (diff)
parent1368e2a82fafbb958f6c069494a1f056f344ae7e (diff)
Merge remote-tracking branch 'origin/users/mmarek/SLE11-SP3' into SLE11-SP3
Pull scripts branch cleanups from Michal Marek.
-rwxr-xr-xscripts/refresh_patch.sh14
1 files changed, 11 insertions, 3 deletions
diff --git a/scripts/refresh_patch.sh b/scripts/refresh_patch.sh
index fcaf85be01..cfa44881b6 100755
--- a/scripts/refresh_patch.sh
+++ b/scripts/refresh_patch.sh
@@ -8,19 +8,27 @@
#
export LC_ALL=C
export LANG=C
+
current=` quilt top `
case "$current" in
- */patches.kernel.org/*)
+*/patches.kernel.org/*)
echo "Will not touch kernel.org patch '$current' because it will disappear soon."
exit 0
;;
- *);;
+*/patches.xen/*)
+ # Preserve file order in xen patches
+ ;;
+*)
+ # Sort files in other patches
+ opt_sort=--sort
+ ;;
esac
+
quilt refresh \
-U 3 \
--no-timestamps \
--no-index \
--diffstat \
- --sort \
+ $opt_sort \
--backup \
-p ab