Re: [PATCH] git-am: don't ignore --keep (-k) option
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:47:47
Jim Meyering [off-list ref] writes:
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 <redacted> 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 <redacted>
At the level of "what does each line of the code do", this is a fix, but as we do a lot more than just stripping "[PATCH] " from the beginning of the Subject: line these days, I think we are better off declaring defeat in this particular codepath and not doing anything here. Adding "[PATCH] " is no longer "keeping the original subject" anyway. It is "without knowing what we already stripped, adding one random string that could have been what we removed". I also have to wonder why $dotest/info does not have the [PATCH] or whatever prefix that we were told not to strip in this codepath. After all, we are running "git mailinfo" with $keep option to produce that file, so if that part is working correctly, we shouldn't even have to have this "add [PATCH] back" trick to begin with. What am I missing???
quoted hunk
--- 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