[Quilt-dev] [PATCH] Fix bogus error message on failed pop

[Jean Delvare]

Hi all,

I noticed that quilt pop is behaving strangely when called with a
non-existing patch name:

$ quilt pop not-there
Patch not-there is not in series
Patch  is not applied

The bug, confusing but otherwise harmess, was introduced in 0.43. The
patch below fixes it, and I'll apply it to CVS if there are no
objections.

Index: quilt/scripts/patchfns.in
===================================================================
RCS file: /cvsroot/quilt/quilt/quilt/scripts/patchfns.in,v
retrieving revision 1.13
diff -u -r1.13 patchfns.in
--- quilt/scripts/patchfns.in   11 Feb 2006 13:35:50 -0000      1.13
+++ quilt/scripts/patchfns.in   13 Apr 2006 12:00:38 -0000
@@ -511,8 +511,9 @@
 
        if [ -n "$name" ]
        then
-               local patch=$(find_patch "$name") || return 1
+               local patch
 
+               patch=$(find_patch "$name") || return 1
                if ! is_applied "$patch"
                then
                        printf $"Patch %s is not applied\n" \
Index: test/three.test
===================================================================
RCS file: /cvsroot/quilt/quilt/test/three.test,v
retrieving revision 1.3
diff -u -r1.3 three.test
--- test/three.test     21 Jan 2006 18:24:38 -0000      1.3
+++ test/three.test     13 Apr 2006 12:00:38 -0000
@@ -166,5 +166,8 @@
        $ quilt annotate f
        > No patches applied
 
+       $ quilt pop patch4.diff
+       > Patch patch4.diff is not in series
+
        $ cd ..
        $ rm -rf d


-- 
Jean Delvare