mergetool: Don't keep temporary merge files unless told to

diff --git a/builtin-branch.c b/builtin-branch.c
index b1a2ad7a6b3b150cda8d031a87352a4daedc40ea..2b3613fea2d7799b7d20e9e30da20527d811ed64 100644 (file)
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -160,7 +160,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds)
                        continue;
                }
 
-               if (delete_ref(name, sha1)) {
+               if (delete_ref(name, sha1, 0)) {
                        error("Error deleting %sbranch '%s'", remote,
                               argv[i]);
                        ret = 1;
@@ -334,11 +334,10 @@ static void print_ref_item(struct ref_item *item, int maxwidth, int verbose,
        }
 
        if (verbose) {
-               struct strbuf subject;
+               struct strbuf subject = STRBUF_INIT;
                const char *sub = " **** invalid ref ****";
                char stat[128];
 
-               strbuf_init(&subject, 0);
                stat[0] = '\0';
 
                commit = item->commit;