- quilt/push.in: Fix a bug introduced with the -p ab support.

- test/dir-a-b.test: Add a regression test case for this fix.

1 files changed, 43 insertions, 0 deletions

diff --git a/test/dir-a-b.test b/test/dir-a-b.test
new file mode 100644
index 0000000..01f0287
--- /dev/null
+++ b/test/dir-a-b.test
@@ -0,0 +1,43 @@
+	$ rm -rf d
+	$ mkdir -p d/patches
+	$ cd d
+
+	$ echo a > test.txt
+
+	$ cat > patches/ab.diff
+	< --- a/test.txt
+	< +++ b/test.txt
+	< @@ -1 +1 @@
+	< -a
+	< +b
+
+	$ echo "ab.diff -pab" > patches/series
+
+	$ quilt push -q
+	> Applying patch patches/ab.diff
+	> Now at patch patches/ab.diff
+
+	$ quilt diff --no-index
+	> --- a/test.txt
+	> +++ b/test.txt
+	> @@ -1 +1 @@
+	> -a
+	> +b
+
+	$ rm patches/ab.diff
+	$ quilt refresh --no-index
+	> Refreshed patch patches/ab.diff
+
+	$ cat patches/ab.diff
+	> --- a/test.txt
+	> +++ b/test.txt
+	> @@ -1 +1 @@
+	> -a
+	> +b
+
+	$ quilt pop -qR
+	> Removing patch patches/ab.diff
+	> No patches applied
+
+	$ cd ..
+	$ rm -rf d