diff options
| author | Jean Delvare <khali@linux-fr.org> | 2005-09-07 16:25:08 +0000 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2005-09-07 16:25:08 +0000 |
| commit | 35ca0a1fb609eeba0244f72b404611a5ef5a8024 (patch) | |
| tree | 2d9b4d070f2a287f47a9e61babc538e5e21b5271 | |
| parent | 0ae8b597aafccbf2dde0417d26c1b45200bb6512 (diff) | |
| download | quilt-35ca0a1fb609eeba0244f72b404611a5ef5a8024.tar.gz | |
- quilt/delete.in: Fix the quilt pop invocation when attempting to delete
the top patch (default). Patch by Joe Green.
| -rw-r--r-- | quilt.changes | 5 | ||||
| -rw-r--r-- | quilt/delete.in | 2 |
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 |