Re: [Quilt-dev] issue with quilt push -f

[Jean Delvare]

Hi Martin,

Le Wednesday 03 December 2014 à 11:26 +0000, Martin Panter a écrit :
> The following patch is against the current master branch. I did a
> quick artificial test and it seems to do the job (quilt push -f now
> does what quilt push -f -q used to do).
> 
> From 2926121cc5cca7c6b45c10df7b9abd87e7c6ea50 Mon Sep 17 00:00:00 2001
> From: Martin Panter <vadmium à gmail·com>
> Date: Wed, 23 Sep 2009 18:20:30 +1000
> Subject: [PATCH] =?UTF-8?q?Do=20not=20use=20interactive=20mode=20with=20?=
>  =?UTF-8?q?=E2=80=9Cquilt=20push=20-f=E2=80=9D?=
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
> 
> Now the "patch -f" option is always used.
> ---
>  quilt/push.in | 7 ++-----
>  1 file 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"

Your e-mail client wrapped long lines and turned tabs into space, so I
can't apply your patch :(

-- 
Jean Delvare
SUSE L3 Support