diff-highlight: ignore test cruft

diff --git a/sequencer.c b/sequencer.c
index 286a4358520429bc8433eaf192beca9690c71ade..3804fa931d819f035ad6b3159cb8efa1745693d0 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -112,7 +112,7 @@ static void remove_sequencer_state(void)
 {
        struct strbuf seq_dir = STRBUF_INIT;
 
-       strbuf_addf(&seq_dir, "%s", git_path(SEQ_DIR));
+       strbuf_addstr(&seq_dir, git_path(SEQ_DIR));
        remove_dir_recursively(&seq_dir, 0);
        strbuf_release(&seq_dir);
 }
@@ -293,6 +293,7 @@ static int do_recursive_merge(struct commit *base, struct commit *next,
        clean = merge_trees(&o,
                            head_tree,
                            next_tree, base_tree, &result);
+       strbuf_release(&o.obuf);
        if (clean < 0)
                return clean;
 
@@ -701,7 +702,7 @@ static struct commit *parse_insn_line(char *bol, char *eol, struct replay_opts *
        if (action != opts->action) {
                if (action == REPLAY_REVERT)
                      error((opts->action == REPLAY_REVERT)
-                           ? _("Cannot revert during a another revert.")
+                           ? _("Cannot revert during another revert.")
                            : _("Cannot revert during a cherry-pick."));
                else
                      error((opts->action == REPLAY_REVERT)