log: teach "terminator" vs "separator" mode to "--pretty=format"

diff --git a/builtin-commit.c b/builtin-commit.c
index 38a542258ab173c76d5171a35799235bb725e63c..8bf35033e473bccd92d7a3f844904889f698b591 100644 (file)
--- a/builtin-commit.c
+++ b/builtin-commit.c
@@ -198,7 +198,8 @@ static void create_base_index(void)
        opts.head_idx = 1;
        opts.index_only = 1;
        opts.merge = 1;
-       opts.index = &the_index;
+       opts.src_index = &the_index;
+       opts.dst_index = &the_index;
 
        opts.fn = oneway_merge;
        tree = parse_tree_indirect(head_sha1);
@@ -809,7 +810,7 @@ static void print_summary(const char *prefix, const unsigned char *sha1)
 
        rev.verbose_header = 1;
        rev.show_root_diff = 1;
-       rev.commit_format = get_commit_format("format:%h: %s");
+       get_commit_format("format:%h: %s", &rev);
        rev.always_show_header = 0;
        rev.diffopt.detect_rename = 1;
        rev.diffopt.rename_limit = 100;