X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=rerere.c;h=8e5532b1ff96a88133d837b9a29fa78117c36abd;hb=158629b2c9baffd0352306bd8dfa0784c981955d;hp=121f9114140708efd36bd4bd1b375f5ad0c558bc;hpb=78a935d48b28ebf5b1af348d7e57763f2955afd1;p=git.git diff --git a/rerere.c b/rerere.c index 121f91141..8e5532b1f 100644 --- a/rerere.c +++ b/rerere.c @@ -79,7 +79,7 @@ static int handle_file(const char *path, enum { RR_CONTEXT = 0, RR_SIDE_1, RR_SIDE_2, RR_ORIGINAL, } hunk = RR_CONTEXT; - struct strbuf one, two; + struct strbuf one = STRBUF_INIT, two = STRBUF_INIT; FILE *f = fopen(path, "r"); FILE *out = NULL; @@ -97,8 +97,6 @@ static int handle_file(const char *path, if (sha1) git_SHA1_Init(&ctx); - strbuf_init(&one, 0); - strbuf_init(&two, 0); while (fgets(buf, sizeof(buf), f)) { if (!prefixcmp(buf, "<<<<<<< ")) { if (hunk != RR_CONTEXT) @@ -354,7 +352,8 @@ int setup_rerere(struct string_list *merge_rr) return -1; merge_rr_path = xstrdup(git_path("MERGE_RR")); - fd = hold_lock_file_for_update(&write_lock, merge_rr_path, 1); + fd = hold_lock_file_for_update(&write_lock, merge_rr_path, + LOCK_DIE_ON_ERROR); read_rr(merge_rr); return fd; }