diff options
| author | Martin Panter <vadmium@gmail.com> | 2009-09-23 18:20:30 +1000 |
|---|---|---|
| committer | Jean Delvare <jdelvare@suse.de> | 2014-12-07 16:04:36 +0100 |
| commit | 3a56cb82222266a1e24b5fa8562eb3d1fd6fccd2 (patch) | |
| tree | b7fd99d41527b62715672cacb017732b36581691 | |
| parent | a6987289e594d5bf0492fce7067723bc2ceb2cfc (diff) | |
| download | quilt-3a56cb82222266a1e24b5fa8562eb3d1fd6fccd2.tar.gz | |
Do not use interactive mode with "quilt push -f"
The interactive mode was broken long ago, and not forcing the
patch causes unpredictable and confusing behavior. Now the
"patch -f" option is always used.
| -rw-r--r-- | quilt/push.in | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/quilt/push.in b/quilt/push.in index 366cc9b..e10fa76 100644 --- a/quilt/push.in +++ b/quilt/push.in @@ -36,8 +36,7 @@ be used. -q Quiet operation. --f Force apply, even if the patch has rejects. Unless in quiet mode, - apply the patch interactively: the patch utility may ask questions. +-f Force apply, even if the patch has rejects. -v Verbose operation. @@ -121,7 +120,7 @@ apply_patch() [ -s "$patch_file" ] || return 0 set -- patch $QUILT_PATCH_OPTS $(push_patch_args "$patch") \ - --backup --prefix="$QUILT_PC/$patch/" \ + --backup --prefix="$QUILT_PC/$patch/" -f \ $no_reject_files $more_patch_args if [ "${patch_file:(-3)}" = ".gz" ] @@ -394,8 +393,6 @@ stop_at_patch=$(find_unapplied_patch "$stop_at_patch") || exit more_patch_args= [ -n "$opt_quiet" ] && more_patch_args="$more_patch_args -s" -[ -z "$opt_force" -o -n "$opt_quiet" ] && - more_patch_args="$more_patch_args -f" if [ -n "$opt_merge" ] then more_patch_args="$more_patch_args --merge$opt_merge_arg" |