lkml.org 
[lkml]   [2012]   [Mar]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    SubjectRe: stripping [PATCH] without losing later tags from mailed patches (Re: [ 02/12] Remove COMPAT_IA32 support)
    Date
    Thomas Rast <trast@inf.ethz.ch> writes:

    >> We can delete "git am -b" (as it was deprecated long time ago), wait
    >> for a cycle or two, and then repurpose it. I do not mind starting
    >> the first step (delete, but do not say anything about repurposing)
    >> before 1.7.10-rc1 happens.
    >
    > Ok, but if I don't get to say anything about repurposing, can I at least
    > make it an error message instead of just spewing out the "invalid
    > option" help?

    Surely. It is not "Am I at least allowed to say" at all; we really
    _should_ make it clear why it is no longer supported.

    What I meant was that "it will start meaning something different" is
    not a relevant thing to see when somebody sees his old script that
    uses "-b" breaks.

    Let's apply your patch so that we do not have to wait one cycle too
    long.

    Thanks.

    >
    > ----- 8< -----
    > Subject: [PATCH] git-am: error out when seeing -b/--binary
    >
    > The --binary option to git-apply has been a no-op since 2b6eef9 (Make
    > apply --binary a no-op., 2006-09-06) and was deprecated in cb3a160
    > (git-am: ignore --binary option, 2008-08-09).
    >
    > We could remove it outright, but let's be nice to people who still
    > have scripts saying 'git am -b' (if they exist) and tell them the
    > reason for the sudden failure.
    >
    > Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    > ---
    > git-am.sh | 4 +++-
    > 1 file changed, 3 insertions(+), 1 deletion(-)
    >
    > diff --git a/git-am.sh b/git-am.sh
    > index 0bd290b..faae820 100755
    > --- a/git-am.sh
    > +++ b/git-am.sh
    > @@ -380,7 +380,9 @@ do
    > -i|--interactive)
    > interactive=t ;;
    > -b|--binary)
    > - : ;;
    > + echo >&2 "The -b/--binary option was deprecated in 1.6.0 and removed in 1.7.10."
    > + die "Please adjust your scripts."
    > + ;;
    > -3|--3way)
    > threeway=t ;;
    > -s|--signoff)


    \
     
     \ /
      Last update: 2012-03-12 22:59    [W:3.092 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site