Junio C Hamano wrote: > Jim Meyering <meyering@xxxxxxxxxx> writes: >> Before this change, a [...] prefix would be removed only as long as >> its length did not exceed 2/3 of the subject length. Now, when the >> bracketed quantity starts with PATCH, it is removed unconditionally. >> Otherwise, the existing behavior remains unchanged. > > Thanks, I think this is a good idea in general, but have two comments. > > - I am not sure how this should play with 17635fc (mailinfo: -b option > keeps [bracketed] strings that is not a [PATCH] marker, 2009-07-15). Ah ha! I see you've already scratched this itch, and more thoroughly, to boot. Also, I prefer your removal of the hard-to-describe 2/3 threshold. > - Regardless of interaction with 17635fc, Things like [RFC PATCH] > [SECURITY PATCH] might want a similar treatment. As your patch does. I started looking at git-am.sh and spotted what appears to be a typo. There is only that one use of $keep_subject, so its value currently comes from the environment. >From 02f7e6433b5db8b18a4cccf58c302159c2f54fa5 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering@xxxxxxxxxx> Date: Wed, 25 Nov 2009 09:10:46 +0100 Subject: [PATCH] git-am: don't ignore --keep (-k) option Fix typo in variable name: s/keep_subject/keep/. Signed-off-by: Jim Meyering <meyering@xxxxxxxxxx> --- git-am.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/git-am.sh b/git-am.sh index 151512a..f353e73 100755 --- a/git-am.sh +++ b/git-am.sh @@ -578,7 +578,7 @@ do sed -e '1,/^$/d' >"$dotest/msg-clean" else SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info")" - case "$keep_subject" in -k) SUBJECT="[PATCH] $SUBJECT" ;; esac + case "$keep" in -k) SUBJECT="[PATCH] $SUBJECT" ;; esac (printf '%s\n\n' "$SUBJECT"; cat "$dotest/msg") | git stripspace > "$dotest/msg-clean" -- 1.6.6.rc0.236.ge0b94 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html