> --- 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"
> @@ -757,6 +761,10 @@ To restore the original branch and stop patching run 
> \"\$cmdline --abort\"."
>               then
>                       cat "$dotest/msg-clean"
>               fi
> +             if test 't' == "$message_id"

The == is bash special, please use = instead
And the 't' can be written as t, so that the whole line looks like this:
                if test t = "$message_id"

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to