diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-08-16 22:18:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-16 22:22:35 -0700 |
| commit | 6bff6a60680ef402f614abae8189c2cb198cfa49 (patch) | |
| tree | a78ad829aefcc7ae100fe9b6547ee3f0cb0b5738 /tools/git-applymbox | |
| parent | Use LF and allow comments in objects/info/alternates file. (diff) | |
| download | tgif-6bff6a60680ef402f614abae8189c2cb198cfa49.tar.xz | |
Teach applymbox to keep the Subject: line.
This corresponds to the -k flag to git format-patch --mbox
option. The option should probably not be used when applying a
real e-mail patch, but is needed when format-patch and applymbox
pair is used for cherrypicking.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'tools/git-applymbox')
| -rwxr-xr-x | tools/git-applymbox | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tools/git-applymbox b/tools/git-applymbox index e44f5d7970..889d4c1743 100755 --- a/tools/git-applymbox +++ b/tools/git-applymbox @@ -9,7 +9,7 @@ ## You give it a mbox-format collection of emails, and it will try to ## apply them to the kernel using "applypatch" ## -## applymbox [ -q ] (-c .dotest/msg-number | mail_archive) [Signoff_file]" +## applymbox [ -k ] [ -q ] (-c .dotest/msg-number | mail_archive) [Signoff_file]" ## ## The patch application may fail in the middle. In which case: ## (1) look at .dotest/patch and fix it up to apply @@ -18,10 +18,11 @@ ## use a Signoff_file, because applypatch wants to append the sign-off ## message to msg-clean every time it is run. -query_apply= continue= resume=t +keep_subject= query_apply= continue= resume=t while case "$#" in 0) break ;; esac do case "$1" in + -k) keep_subject=-k ;; -q) query_apply=t ;; -c) continue="$2"; resume=f; shift ;; -*) usage ;; @@ -41,6 +42,9 @@ esac case "$query_apply" in t) touch .dotest/.query_apply esac +case "$keep_subject" in +-k) : >.dotest/.keep_subject +esac signoff="$1" set x .dotest/0* @@ -52,7 +56,8 @@ do f,$i) resume=t;; f,*) continue;; *) - git-mailinfo .dotest/msg .dotest/patch <$i >.dotest/info || exit 1 + git-mailinfo $keep_subject \ + .dotest/msg .dotest/patch <$i >.dotest/info || exit 1 git-stripspace < .dotest/msg > .dotest/msg-clean ;; esac |