Merge branch 'rs/merge-recursive-string-list-init' into maint

diff --git a/bisect.c b/bisect.c
index 7996c2907b0e571578f2ce18095c83c134a503b3..dc13319c20b255d2a3d76f237746ba5dc953680a 100644 (file)
--- a/bisect.c
+++ b/bisect.c
@@ -860,8 +860,8 @@ static void check_good_are_ancestors_of_bad(const char *prefix, int no_checkout)
        /* Create file BISECT_ANCESTORS_OK. */
        fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0600);
        if (fd < 0)
-               warning("could not create file '%s': %s",
-                       filename, strerror(errno));
+               warning_errno("could not create file '%s'",
+                             filename);
        else
                close(fd);
  done:
@@ -890,6 +890,7 @@ static void show_diff_tree(const char *prefix, struct commit *commit)
        if (!opt.diffopt.output_format)
                opt.diffopt.output_format = DIFF_FORMAT_RAW;
 
+       setup_revisions(0, NULL, &opt, NULL);
        log_tree_commit(&opt, commit);
 }
 
@@ -910,8 +911,7 @@ void read_bisect_terms(const char **read_bad, const char **read_good)
                        *read_good = "good";
                        return;
                } else {
-                       die("could not read file '%s': %s", filename,
-                               strerror(errno));
+                       die_errno("could not read file '%s'", filename);
                }
        } else {
                strbuf_getline_lf(&str, fp);