commit-graph: use string-list API for input

diff --git a/builtin/merge.c b/builtin/merge.c
index fb4faca2507fdf00a1bbd48817e2ff0bc9957fc3..4a4c09496cfee08417c18cc010528464a3137488 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1186,14 +1186,15 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
        branch = branch_to_free = resolve_refdup("HEAD", 0, &head_oid, NULL);
        if (branch)
                skip_prefix(branch, "refs/heads/", &branch);
+
+       init_diff_ui_defaults();
+       git_config(git_merge_config, NULL);
+
        if (!branch || is_null_oid(&head_oid))
                head_commit = NULL;
        else
                head_commit = lookup_commit_or_die(&head_oid, "HEAD");
 
-       init_diff_ui_defaults();
-       git_config(git_merge_config, NULL);
-
        if (branch_mergeoptions)
                parse_branch_merge_options(branch_mergeoptions);
        argc = parse_options(argc, argv, prefix, builtin_merge_options,