ends_rfc2822_footer() was incorrectly checking whether the current line was a continuation of the previous line. It was actually checking the next line instead of the current line. Let's fix this and mark the test as expect_success. Signed-off-by: Brandon Casey <bcasey@xxxxxxxxxx> --- sequencer.c | 2 +- t/t3511-cherry-pick-x.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sequencer.c b/sequencer.c index be0cb8b..01edec2 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1040,7 +1040,7 @@ static int ends_rfc2822_footer(struct strbuf *sb, int ignore_footer) ; /* do nothing */ k++; - if ((buf[k] == ' ' || buf[k] == '\t') && !first) + if ((buf[i] == ' ' || buf[i] == '\t') && !first) continue; first = 0; diff --git a/t/t3511-cherry-pick-x.sh b/t/t3511-cherry-pick-x.sh index b4e5c65..b2098e0 100755 --- a/t/t3511-cherry-pick-x.sh +++ b/t/t3511-cherry-pick-x.sh @@ -52,7 +52,7 @@ test_expect_success 'cherry-pick -s inserts blank line after non-rfc2822 footer' test_cmp expect actual ' -test_expect_failure 'cherry-pick -s not confused by rfc2822 continuation line' ' +test_expect_success 'cherry-pick -s not confused by rfc2822 continuation line' ' pristine_detach initial && git cherry-pick -s rfc2822-base && cat <<-EOF >expect && -- 1.8.0 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html