summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--quilt.changes5
-rw-r--r--quilt/delete.in2
2 files changed, 6 insertions, 1 deletions
diff --git a/quilt.changes b/quilt.changes
index ebb1bb5..38d3ad0 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,3 +1,8 @@
+Wed Sep 7 18:22:29 CEST 2005 - khali@linux-fr.org
+
+- quilt/delete.in: Fix the quilt pop invocation when attempting
+ to delete the top patch (default). Patch by Joe Green.
+
-------------------------------------------------------------------
Tue Sep 6 20:22:04 CEST 2005 - khali@linux-fr.org
diff --git a/quilt/delete.in b/quilt/delete.in
index 4511374..3138f9f 100644
--- a/quilt/delete.in
+++ b/quilt/delete.in
@@ -113,7 +113,7 @@ fi
if is_applied $patch
then
if [ "$patch" != "$(top_patch)" ] || \
- ! @QUILT@/pop -fq "$patch"
+ ! QUILT_COMMAND= @BASH@ $BASH_OPTS -c ". @QUILT@/pop" "quilt pop" -fq
then
printf $"Patch %s is currently applied\n" \
"$(print_patch $patch)" >&2