- scripts/patchfns.in: Rewrite files_in_patch_ordered() so as to not

  require the awk asort function, which is not available on all versions
  of awk.
- test/sort.test: Add more files to better test the ordering and sorting
  issues. Original patch by John Vandenberg.

1 files changed, 42 insertions, 2 deletions

diff --git a/test/sort.test b/test/sort.test
index 0e0a23f..b2588b5 100644
--- a/test/sort.test
+++ b/test/sort.test
@@ -4,41 +4,78 @@
 	$ quilt new sort.diff
 	> Patch patches/sort.diff is now on top
 
-	$ quilt add b c
+	$ quilt add b f
 	> File b added to patch patches/sort.diff
-	> File c added to patch patches/sort.diff
+	> File f added to patch patches/sort.diff
 
 	$ echo b > b
+	$ echo f > f
+	$ quilt refresh
+	> Refreshed patch patches/sort.diff
+
+	$ quilt add c
+	> File c added to patch patches/sort.diff
+
 	$ echo c > c
 	$ quilt refresh
 	> Refreshed patch patches/sort.diff
 
+	$ quilt files
+	> b
+	> f
+	> c
+
+	$ quilt add z x
+	> File z added to patch patches/sort.diff
+	> File x added to patch patches/sort.diff
+
+	$ echo z > z
+	$ echo x > x
+	$ quilt files
+	> b
+	> f
+	> c
+	> x
+	> z
+
 	$ quilt add a
 	> File a added to patch patches/sort.diff
 
 	$ echo a > a
 	$ quilt files
 	> b
+	> f
 	> c
 	> a
+	> x
+	> z
 
 	$ quilt diff | grep ^Index
 	> Index: d/b
+	> Index: d/f
 	> Index: d/c
 	> Index: d/a
+	> Index: d/x
+	> Index: d/z
 
 	$ quilt refresh
 	> Refreshed patch patches/sort.diff
 
 	$ grep ^Index patches/sort.diff
 	> Index: d/b
+	> Index: d/f
 	> Index: d/c
 	> Index: d/a
+	> Index: d/x
+	> Index: d/z
 
 	$ quilt diff --sort | grep ^Index
 	> Index: d/a
 	> Index: d/b
 	> Index: d/c
+	> Index: d/f
+	> Index: d/x
+	> Index: d/z
 
 	$ quilt refresh --sort
 	> Refreshed patch patches/sort.diff
@@ -47,6 +84,9 @@
 	> Index: d/a
 	> Index: d/b
 	> Index: d/c
+	> Index: d/f
+	> Index: d/x
+	> Index: d/z
 	
 	$ cd ..
 	$ rm -rf d