summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2006-01-19 16:38:17 +0000
committerAndreas Gruenbacher <agruen@suse.de>2006-01-19 16:38:17 +0000
commit88f3b8cf85c5553fb8bb2c72af0fed884812945e (patch)
tree8506535b590f6d6cde8d3d2c0e04c7c6d3ea68ad
parent188c7dac15a72c437c47664d3162b9f13844fe88 (diff)
downloadquilt-88f3b8cf85c5553fb8bb2c72af0fed884812945e.tar.gz
- Make sure quilt diff --snapshot visits files in a defined order.
-rw-r--r--quilt.changes5
-rw-r--r--quilt/diff.in2
2 files changed, 6 insertions, 1 deletions
diff --git a/quilt.changes b/quilt.changes
index bee159f..ae9c24d 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Thu Jan 19 17:34:05 CET 2006 - agruen@suse.de
+
+- Make sure quilt diff --snapshot visits files in a defined order.
+
+-------------------------------------------------------------------
Thu Jan 19 18:52:30 AEDT 2006 - jayvdb@gmail.com
- Move patch parameter checks into patchfns.in, adding quotes
diff --git a/quilt/diff.in b/quilt/diff.in
index 2cdd1a7..f22cdb4 100644
--- a/quilt/diff.in
+++ b/quilt/diff.in
@@ -251,7 +251,7 @@ then
do
echo "${file#$QUILT_PC/$snap_subdir/}" >&4
done \
- < <(find $QUILT_PC/$snap_subdir -type f)
+ < <(find $QUILT_PC/$snap_subdir -type f | sort)
# Also look at all patches that are currently applied.
opt_combine=1
first_patch="$(applied_patches | head -n 1)"