diff options
author | Andreas Gruenbacher <agruen@suse.de> | 2003-04-11 15:17:36 +0000 |
---|---|---|
committer | Andreas Gruenbacher <agruen@suse.de> | 2003-04-11 15:17:36 +0000 |
commit | 96bc5706ab58cf45ed28ac4c2eb2cccddc6ae9f2 (patch) | |
tree | 1d1ca9a8a8094c1a152e3243496edb9baef3a1a1 /scripts | |
parent | 61cd791cf9d0e4a027517d44d3bebc4c3bd05198 (diff) | |
download | quilt-96bc5706ab58cf45ed28ac4c2eb2cccddc6ae9f2.tar.gz |
- Apply patches with `patch -f' by default. Add --interactive
option top `quilt push' to allow applying patches without
`patch -f'.
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/apatch.in | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/scripts/apatch.in b/scripts/apatch.in index ca97d13..046e54f 100755 --- a/scripts/apatch.in +++ b/scripts/apatch.in @@ -56,15 +56,15 @@ apply_patch() then gzip -cd $patch_file \ | @PATCH@ $(patch_args $patch) --no-backup-if-mismatch \ - -E $silent + -E $silent $force_apply elif [ "x${patch_file:(-4)}" = "x.bz2" ] then bzip2 -cd $patch_file \ | @PATCH@ $(patch_args $patch) --no-backup-if-mismatch \ - -E $silent + -E $silent $force_apply else @PATCH@ $(patch_args $patch) --no-backup-if-mismatch \ - -E $silent -i $patch_file + -E $silent -i $patch_file $force_apply fi } @@ -133,7 +133,7 @@ apatch() return $status } -options=`getopt -o fqvh --long leave-rejects -- "$@"` +options=`getopt -o fqvh --long leave-rejects,interactive -- "$@"` if [ $? -ne 0 ] then @@ -157,6 +157,9 @@ do --leave-rejects) opt_leave_rejects=1 shift ;; + --interactive) + opt_interactive=1 + shift ;; -h) usage -h ;; --) @@ -172,6 +175,7 @@ fi [ -n "$opt_quiet" ] && silent=-s [ -z "$opt_verbose" ] && silent_unless_verbose=-s +[ -z "$opt_interactive" ] && force_apply=-f patch=$(stripit $1) |