From: Christian Couder <chriscool@tuxfamily.org>
Date: Sun, 09 Nov 2014 09:23:38 GMT
Subject: [PATCH v2 0/5] Small "git interpret-trailers" fixes
Message-ID: <20141109092313.4864.54933.chriscool@tuxfamily.org>

Here is a series to fix a few small bugs in "git interpret-trailers".

Patch 1/5 and patch 2/5 are independent from the last 3 patches,
and can be applied to master.

Patches 3/5, 4/5 and 5/5 depend on this series by Junio:

        jc/conflict-hint (2014-10-28) 4 commits
          (merged to 'next' on 2014-10-29 at 693250f)

Changes since the previous version are:

* use "%.*s" instead of a strbuf, in patch 2/5

* add new find_trailer_end() function and a call to strbuf_release(),
  in patch 4/5

Thanks to Junio and Peff.

Christian Couder (5):
  trailer: ignore comment lines inside the trailers
  trailer: display a trailer without its trailing newline
  commit: make ignore_non_trailer() non static
  trailer: reuse ignore_non_trailer() to ignore conflict lines
  trailer: add test with an old style conflict block

 builtin/commit.c              | 46 -------------------------------------------
 commit.c                      | 46 +++++++++++++++++++++++++++++++++++++++++++
 commit.h                      |  3 +++
 t/t7513-interpret-trailers.sh | 34 +++++++++++++++++++++++++++++++-
 trailer.c                     | 46 ++++++++++++++++++++++++++++++++-----------
 5 files changed, 117 insertions(+), 58 deletions(-)

-- 
2.1.2.555.gfbecd99