On Sun, Jan 27, 2013 at 6:34 PM, Jonathan Nieder jrnie...@gmail.com wrote:
Brandon Casey wrote:
--- a/sequencer.c
+++ b/sequencer.c
@@ -497,6 +558,8 @@ static int do_pick_commit(struct commit *commit, struct
replay_opts *opts)
}
if (opts-record_origin) {
+
Start treating the (cherry picked from line added by cherry-pick -x
the same way that the s-o-b lines are treated. Namely, separate them
from the main commit message body with an empty line.
This commit is mostly a code movement, but notice that
has_conforming_footer() was modified, in addition
Brandon Casey wrote:
--- a/sequencer.c
+++ b/sequencer.c
@@ -20,6 +20,67 @@
[...]
static int has_conforming_footer(struct strbuf *sb, int ignore_footer)
[...]
+ /* require at least one blank line */
+ if (!last_char_was_nl || buf[i] != '\n')
+ return 0;
Makes sense.
3 matches
Mail list logo