lkml.org 
[lkml]   [2012]   [Mar]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    SubjectRe: stripping [PATCH] without losing later tags from mailed patches (Re: [ 02/12] Remove COMPAT_IA32 support)
    Date
    [+cc Junio because of backwards-compat issues]

    Willy Tarreau <w@1wt.eu> writes:

    > On Mon, Mar 12, 2012 at 08:20:04AM -0700, Greg KH wrote:
    >>
    >> I don't see a -b option to 'git am' in the manpage, am I missing
    >> something here?
    >
    > It's in the master tree only right now, and the option is "--keep-non-patch"
    > (could have been shorter). Currently rebuilding to test it :-)

    Exactly.

    The problem with -b is that it's a backwards-compatibility shorthand for
    --binary, which used to pass --allow-binary-replacement (or --binary) to
    git-apply. However, that option was obsoleted in 2b6eef9 (Make apply
    --binary a no-op., 2006-09-06) and has been a no-op for over 5 years.
    It has also not been documented since cb3a160 (git-am: ignore --binary
    option, 2008-08-09).

    So perhaps we can safely claim -b for --keep-non-patch, like so:

    diff --git i/Documentation/git-am.txt w/Documentation/git-am.txt
    index ee6cca2..9ec9313 100644
    --- i/Documentation/git-am.txt
    +++ w/Documentation/git-am.txt
    @@ -40,6 +40,7 @@ OPTIONS
    --keep::
    Pass `-k` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).

    +-b::
    --keep-non-patch::
    Pass `-b` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).

    diff --git i/git-am.sh w/git-am.sh
    index 0bd290b..4b071de 100755
    --- i/git-am.sh
    +++ w/git-am.sh
    @@ -9,13 +9,13 @@ git am [options] [(<mbox>|<Maildir>)...]
    git am [options] (--resolved | --skip | --abort)
    --
    i,interactive run interactively
    -b,binary* (historical option -- no-op)
    +binary* (historical option -- no-op)
    3,3way allow fall back on 3way merging if needed
    q,quiet be quiet
    s,signoff add a Signed-off-by line to the commit message
    u,utf8 recode into utf8 (default)
    k,keep pass -k flag to git-mailinfo
    -keep-non-patch pass -b flag to git-mailinfo
    +b,keep-non-patch pass -b flag to git-mailinfo
    keep-cr pass --keep-cr flag to git-mailsplit for mbox format
    no-keep-cr do not pass --keep-cr flag to git-mailsplit independent of am.keepcr
    c,scissors strip everything before a scissors line
    @@ -379,7 +379,7 @@ do
    case "$1" in
    -i|--interactive)
    interactive=t ;;
    - -b|--binary)
    + --binary)
    : ;;
    -3|--3way)
    threeway=t ;;
    @@ -391,7 +391,7 @@ do
    utf8= ;;
    -k|--keep)
    keep=t ;;
    - --keep-non-patch)
    + -b|--keep-non-patch)
    keep=b ;;
    -c|--scissors)
    scissors=t ;;
    --
    Thomas Rast
    trast@{inf,student}.ethz.ch

    \
     
     \ /
      Last update: 2012-03-12 17:45    [W:0.025 / U:120.308 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site