diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-08 00:35:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-08 00:35:59 -0800 |
| commit | 6ae611fa8d1e15e918e59b7e20abf98643cd25e4 (patch) | |
| tree | 611ef958730a8a90ce0b73996d45609897d0779e | |
| parent | 1f54d693fda851a1df81e2b6c85f1c72f4633916 (diff) | |
| parent | 470b452628d80e89ee869b6b86af6c536ba0b24d (diff) | |
| download | git-6ae611fa8d1e15e918e59b7e20abf98643cd25e4.tar.gz git-6ae611fa8d1e15e918e59b7e20abf98643cd25e4.tar.xz | |
Merge branch 'jc/maint-fix-mailinfo-strip' into maint
* jc/maint-fix-mailinfo-strip:
mailinfo: do not strip leading spaces even for a header line
| -rw-r--r-- | builtin-mailinfo.c | 3 | ||||
| -rw-r--r-- | t/t5100/msg0015 | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c index a50ac2256..ce2ef6bed 100644 --- a/builtin-mailinfo.c +++ b/builtin-mailinfo.c @@ -779,8 +779,7 @@ static int handle_commit_msg(struct strbuf *line) return 0; if (still_looking) { - strbuf_ltrim(line); - if (!line->len) + if (!line->len || (line->len == 1 && line->buf[0] == '\n')) return 0; } diff --git a/t/t5100/msg0015 b/t/t5100/msg0015 index 957723868..4abb3d5c6 100644 --- a/t/t5100/msg0015 +++ b/t/t5100/msg0015 @@ -1,2 +1,2 @@ -- a list + - a list - of stuff |