git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Florian Weimer <fweimer@redhat.com>
To: Eric Wong <e@80x24.org>
Cc: git@vger.kernel.org
Subject: Re: Special strings in commit messages
Date: Mon, 9 Oct 2017 15:38:13 +0200	[thread overview]
Message-ID: <6a036339-d57d-4cc8-acfc-4e1786763a80@redhat.com> (raw)
In-Reply-To: <20171008213053.GA8568@starla>

On 10/08/2017 11:30 PM, Eric Wong wrote:
> diff --git a/git-rebase--am.sh b/git-rebase--am.sh
> index 6e64d40d6f..14c50782e0 100644
> --- a/git-rebase--am.sh
> +++ b/git-rebase--am.sh
> @@ -53,6 +53,7 @@ else
>   
>   	git format-patch -k --stdout --full-index --cherry-pick --right-only \
>   		--src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \
> +		--pretty=mboxrd \
>   		$git_format_patch_opt \
>   		"$revisions" ${restrict_revision+^$restrict_revision} \
>   		>"$GIT_DIR/rebased-patches"
> @@ -83,6 +84,7 @@ else
>   	fi
>   
>   	git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" \
> +		--patch-format=mboxrd \
>   		$allow_rerere_autoupdate \
>   		${gpg_sign_opt:+"$gpg_sign_opt"} <"$GIT_DIR/rebased-patches"
>   	ret=$?

My context is slightly different, but I added the mboxrd options 
manually to both commands, and it fixes my test case.

I'm still wondering if I have to be on the lookout for similar issues 
with different strings.

Thanks,
Florian

  reply	other threads:[~2017-10-09 13:38 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-08 18:24 Special strings in commit messages Florian Weimer
2017-10-08 21:30 ` Eric Wong
2017-10-09 13:38   ` Florian Weimer [this message]
2017-11-18  1:01     ` [PATCH v2] rebase: use mboxrd format to avoid split errors Eric Wong

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6a036339-d57d-4cc8-acfc-4e1786763a80@redhat.com \
    --to=fweimer@redhat.com \
    --cc=e@80x24.org \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).