Merge branch 'jk/test-send-sh-x-trace-elsewhere' into maint

diff --git a/sequencer.c b/sequencer.c
index e60e75ad749a18a3c12d95475f95e67e455ab371..e66f2fe0f0409cccf1647f7851044f91d68252a6 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -877,7 +877,7 @@ static int sequencer_rollback(struct replay_opts *opts)
        if (!f)
                return error(_("cannot open %s: %s"), git_path_head_file(),
                                                strerror(errno));
-       if (strbuf_getline(&buf, f, '\n')) {
+       if (strbuf_getline_lf(&buf, f)) {
                error(_("cannot read %s: %s"), git_path_head_file(),
                      ferror(f) ?  strerror(errno) : _("unexpected end of file"));
                fclose(f);