Re: [Quilt-dev] [PATCH] push: patch's --merge option has an optional argument now

[Jean Delvare]

Hi Bert,

Le lundi 25 janvier 2010 11:58, Bert Wesarg a écrit :
> Hi,
> 
> On Mon, Jan 25, 2010 at 11:40, Andreas Gruenbacher <address@hidden> wrote:
> > On Monday 25 January 2010 11:28:44 Jean Delvare wrote:
> >> Hi Bert,
> >>
> >> Le samedi 2 janvier 2010 13:33, Bert Wesarg a écrit :
> >> > Since version 2.6.1 the patch utility knows an optional argument for
> >> > --merge. Regognize this and pass it on to patch.
> >> >
> >> > Signed-off-by: Bert Wesarg <address@hidden>
> >> >
> >> > ---
> >> >  quilt/push.in |   21 +++++++++++++++------
> >> >  1 files changed, 15 insertions(+), 6 deletions(-)
> >> >
> >> > diff --git a/quilt/push.in b/quilt/push.in
> >> > index d89f927..66980c6 100644
> >> > --- a/quilt/push.in
> >> > +++ b/quilt/push.in
> >> > @@ -21,7 +21,7 @@ setup_colors
> >> >
> >> >  usage()
> >> >  {
> >> > -   printf $"Usage: quilt push [-afqv] [--merge] [--leave-rejects]
> >> > [--color[=always|auto|never]] [num|patch]\n" +      printf $"Usage: 
> >> > quilt push
> >> > [-afqv] [--merge[=merge|diff3]] [--leave-rejects]
> >> > [--color[=always|auto|never]] [num|patch]\n" if [ x$1 = x-h ]
> >> >     then
> >> >             printf $"
> >> > @@ -44,7 +44,7 @@ be used.
> >> >  --fuzz=N
> >> >     Set the maximum fuzz factor (default: 2).
> >> >
> >> > --m, --merge
> >> > +-m, --merge[=merge|diff3]
> >> >     Merge the patch file into the original files (see patch(1)).
> >> >
> >> >  --leave-rejects
> >> > @@ -274,7 +274,7 @@ list_patches()
> >> >     fi
> >> >  }
> >> >
> >> > -options=`getopt -o fqvamh --long fuzz:,merge,leave-rejects,color:: --
> >> > "$@"` +options=`getopt -o fqvamh --long
> >> > fuzz:,merge::,leave-rejects,color:: -- "$@"`
> >>
> >> Shouldn't "-o fqvamh" become "-o fqvam::h"?
> >
> > Yes indeed, thanks.
> Thanks, to both of you. Should I resend the patch or can the committer
> fix the getopt line?

I'll fix that and commit your patch, thanks for your contribution.

-- 
Jean Delvare
Suse L3