Re: [PATCH v4] git-am: add option to extract email Message-Id: tag into commit log
- From
Torsten Bögershausen <tboegi@web.de>
- Date
- Jul 2, 2014, 15:03 UTC
- Message-ID
- <53B41F28.8040205@web.de>
- In-Reply-To
- <1404312673-11836-1-git-send-email-avi@cloudius-systems.com>
Show 43 quoted lines
> diff --git a/git-am.sh b/git-am.sh
> index ee61a77..fd0181f 100755
> --- a/git-am.sh
> +++ b/git-am.sh
> @@ -39,6 +39,7 @@ committer-date-is-author-date lie about committer date
> ignore-date use current timestamp for author date
> rerere-autoupdate update the index with reused conflict resolution if possible
> S,gpg-sign? GPG-sign commits
> +m,message-id copy the Message-Id: header to the commit's tag stanza
> rebasing* (internal use for git-rebase)"
>
> . git-sh-setup
> @@ -371,7 +372,7 @@ split_patches () {
> prec=4
> dotest="$GIT_DIR/rebase-apply"
> sign= utf8=t keep= keepcr= skip= interactive= resolved= rebasing= abort=
> -resolvemsg= resume= scissors= no_inbody_headers=
> +resolvemsg= resume= scissors= no_inbody_headers= message_id=
> git_apply_opt=
> committer_date_is_author_date=
> ignore_date=
> @@ -442,6 +443,8 @@ it will be removed. Please do not use it anymore."
> gpg_sign_opt=-S ;;
> --gpg-sign=*)
> gpg_sign_opt="-S${1#--gpg-sign=}" ;;
> + -m|--message-id)
> + message_id=t ;;
> --)
> shift; break ;;
> *)
> @@ -565,6 +568,7 @@ Use \"git am --abort\" to remove it.")"
> echo " $git_apply_opt" >"$dotest/apply-opt"
> echo "$threeway" >"$dotest/threeway"
> echo "$sign" >"$dotest/sign"
> + echo "$message_id" >"$dotest/message-id"
> echo "$utf8" >"$dotest/utf8"
> echo "$keep" >"$dotest/keep"
> echo "$scissors" >"$dotest/scissors"
> @@ -651,6 +655,10 @@ then
> else
> SIGNOFF=
> fi
> +if test "$(cat "$dotest/message-id")" = tDoes the usage of '"' inside of '"' look good, or can we write like this: if test $(cat "$dotest/message-id") = t