From: Alexey Shumkin <zapped@mail.ru>
To: Jeff King <peff@peff.net>
Cc: Ingo Ruhnke <grumbel@gmail.com>, git@vger.kernel.org
Subject: Re: Problems with format-patch UTF-8 and a missing second empty line
Date: Fri, 16 Sep 2011 00:05:15 +0400 [thread overview]
Message-ID: <20110916000515.1dfc5665@zappedws> (raw)
In-Reply-To: <20110915185033.GA17016@sigill.intra.peff.net>
> >
> > I reproduced this bug with the latest git (v1.7.6.3)
> > It seems to me this is not the "git format-patch" bug
> > but "git am"'s one. (But it is only the supposition)
>
> Can you be more specific about what you tested? Running Ingo's snippet
> with a more recent git produces:
>
> Subject: [PATCH] =?UTF-8?q?=C3=84=C3=96=C3=9C=20=C3=84=C3=96=C3=9C?=
>
> which is right (and "git am", new or old, will apply it just fine).
>
> But there may be a different, related bug lurking somewhere.
>
> -Peff
>
this is my steps (log from terminal)
$ mkdir git-format-patch
Initialized empty Git repository
in /home/Alex/tmp/git-format-patch/.git/
$ cd git-format-patch
$ echo file content > file
$ git add -vf file
add 'file'
$ git commit -a -m 'коммит: строка-1
> коммит: строка-2'
[master (root-commit) 7ede929] коммит: строка-1 коммит: строка-2
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 file
$ git log
commit 7ede9291cf2d160721bcd8362d8d0f6c6e28cf29
Author: Alexey Shumkin <zapped@mail.ru>
Date: Thu Sep 15 23:18:26 2011 +0400
коммит: строка-1
коммит: строка-2
$ git format-patch --root HEAD
0001-1.patch
$ cat 0001-1.patch
From 7ede9291cf2d160721bcd8362d8d0f6c6e28cf29 Mon Sep 17 00:00:00 2001
From: Alexey Shumkin <zapped@mail.ru>
Date: Thu, 15 Sep 2011 23:18:26 +0400
Subject: [PATCH]
=?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BC=D0=B8=D1=82:=20=D1=81=D1?=
=?UTF-8?q?=82=D1=80=D0=BE=D0=BA=D0=B0-1=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B8=D1?=
=?UTF-8?q?=82:=20=D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B0-2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
file | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 file
diff --git a/file b/file
new file mode 100644
index 0000000..dd59d09
--- /dev/null
+++ b/file
@@ -0,0 +1 @@
+file content
--
1.7.6.3.4.gf71f
$ git init ../git-format-patch-am
Initialized empty Git repository
in /home/Alex/tmp/git-format-patch-am/.git/
$ cd ../git-format-patch-am
$ git am < ../git-format-patch/0001-1.patch
Applying: коммит: строка-1 коммит: строка-2
applying to an empty history
$ git log
commit 9856238e06d4ca8faeefc48e5c80e8ef7bd34195
Author: Alexey Shumkin <zapped@mail.ru>
Date: Thu Sep 15 23:18:26 2011 +0400
коммит: строка-1 коммит: строка-2
$ git --version
git version 1.7.6.3.4.gf71f
But as you said
>>This is by design. Git commit messages are intended to have a
>>single-line subject, followed by a blank line, followed by more
>>elaboration
and solved with "-k" for both "format-patch" and "am" commands
next prev parent reply other threads:[~2011-09-15 20:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-15 9:45 Problems with format-patch UTF-8 and a missing second empty line Ingo Ruhnke
2011-09-15 15:17 ` Jeff King
[not found] ` <20110915224456.14410ed8@zappedws>
2011-09-15 18:50 ` Jeff King
2011-09-15 20:05 ` Alexey Shumkin [this message]
2011-09-15 20:33 ` Jeff King
2011-09-15 19:01 ` Jeff King
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=20110916000515.1dfc5665@zappedws \
--to=zapped@mail.ru \
--cc=git@vger.kernel.org \
--cc=grumbel@gmail.com \
--cc=peff@peff.net \
/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).