From: Florian Weimer <fweimer@redhat.com>
To: git@vger.kernel.org
Subject: Special strings in commit messages
Date: Sun, 8 Oct 2017 20:24:37 +0200 [thread overview]
Message-ID: <f54bea17-c245-c644-f974-ca2ac84901c6@redhat.com> (raw)
I have a commit which looks like this:
$ git cat-file commit 4ca76eb7b47724c2444dfea7890fa8db4edd5762
tree c845be47a0653624b1984d0dc1a0b485b527811d
parent 9eee98638ef06149e17f94afaa357e3a9e296e69
author Florian Weimer <fweimer@redhat.com> 1507481682 +0200
committer Florian Weimer <fweimer@redhat.com> 1507481682 +0200
19: glibc-fedora-nis-rh188246.patch
From baba5d9461d4e8a581ac26fe4412ad783ffc73e7 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 1 May 2006 08:02:53 +0000
Subject: [PATCH] Enable SETENT_BATCH_READ nis/nss option by default
* Mon May 1 2006 Jakub Jelinek <jakub@redhat.com> 2.4.90-4
- SETENT_BATCH_READ /etc/default/nss option for speeding up
some usages of NIS+ (#188246)
This commit causes git rebase to fail, with this error:
fatal: could not parse .git/rebase-apply/0008
At this point, .git/rebase-apply/0008 contains this:
“
From baba5d9461d4e8a581ac26fe4412ad783ffc73e7 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 1 May 2006 08:02:53 +0000
Subject: [PATCH] Enable SETENT_BATCH_READ nis/nss option by default
* Mon May 1 2006 Jakub Jelinek <jakub@redhat.com> 2.4.90-4
- SETENT_BATCH_READ /etc/default/nss option for speeding up
some usages of NIS+ (#188246)
---
nis/nss | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nis/nss b/nis/nss
index
0ac6774a1ff29f012efaec9c4be1fcc3b83da7e8..d720e719267db5f741b67e7b98e4052e503c4333
100644
”
Followed by the diff. The preceding patch, .git/rebase-apply/0007, is:
“
[fweimer@oldenburg glibc-patches]$ cat .git/rebase-apply/0007
From 4ca76eb7b47724c2444dfea7890fa8db4edd5762 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Sun, 8 Oct 2017 18:54:42 +0200
Subject: 19: glibc-fedora-nis-rh188246.patch
”
Based on strace output, something in git rebase calls git mailsplit, and
it probably sees the "\nFrom " string and treats it as a start of a new
mail message, and things go downhill from there.
I will escape "\nFrom " in commit messages (probably as "\n.From " or
maybe "\n>From ", plus escaping for "\n."/"\n>" to make the encoding
reversible), but I wonder if there is something else I need to escape
while I'm at it.
Thanks,
Florian
next reply other threads:[~2017-10-08 18:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-08 18:24 Florian Weimer [this message]
2017-10-08 21:30 ` Special strings in commit messages Eric Wong
2017-10-09 13:38 ` Florian Weimer
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f54bea17-c245-c644-f974-ca2ac84901c6@redhat.com \
--to=fweimer@redhat.com \
--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.
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 NNTP newsgroup(s).