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 /quilt | |
| 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 'quilt')
| -rw-r--r-- | quilt/push.in | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/quilt/push.in b/quilt/push.in index ad3c706..423b10c 100644 --- a/quilt/push.in +++ b/quilt/push.in @@ -40,7 +40,11 @@ patch name is specified, apply the next patch from the series file. --leave-rejects Leave around the reject files patch produced, even if the patch is not actually applied. - + +--interactive + Allow the patch utility to ask hwo to deal with conflicts. If + this option is not given, the -f patch optionch will be used. + " exit 0 else @@ -85,7 +89,7 @@ list_patches() fi } -options=`getopt -o fqvah --long leave-rejects -- "$@"` +options=`getopt -o fqvah --long leave-rejects,interactive -- "$@"` if [ $? -ne 0 ] then @@ -114,6 +118,9 @@ do --leave-rejects) opt_leave_rejects=1 shift ;; + --interactive) + opt_interactive=1 + shift ;; --) shift break ;; @@ -145,6 +152,8 @@ fi apatch_options="$apatch_options -v" [ -n "$opt_leave_rejects" ] && apatch_options="$apatch_options --leave-rejects" +[ -n "$opt_interactive" ] && + apatch_options="$apatch_options --interactive" if [ -n "$stop_at_patch" ] then |