From: Jim Meyering <jim@meyering•net>
To: Junio C Hamano <gitster@pobox•com>
Cc: git list <git@vger•kernel.org>
Subject: [PATCH] git-am: don't ignore --keep (-k) option
Date: Wed, 25 Nov 2009 09:13:08 +0100 [thread overview]
Message-ID: <87638zm38r.fsf_-_@meyering.net> (raw)
In-Reply-To: <7vmy2b76ji.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Tue, 24 Nov 2009 17:10:57 -0800")
Junio C Hamano wrote:
> Jim Meyering <meyering@redhat•com> 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@redhat•com>
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@redhat•com>
---
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
next prev parent reply other threads:[~2009-11-25 8:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-24 10:58 [PATCH] mailinfo: remove [PATCH...] prefix from Subject regardless of length Jim Meyering
2009-11-25 1:10 ` Junio C Hamano
2009-11-25 8:13 ` Jim Meyering [this message]
2009-11-27 20:03 ` [PATCH] git-am: don't ignore --keep (-k) option Junio C Hamano
2009-11-27 20:17 ` Jim Meyering
2009-11-27 21:11 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87638zm38r.fsf_-_@meyering.net \
--to=jim@meyering$(echo .)net \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox