bisect: display first bad commit without forking a new process

Previously "git diff-tree --pretty COMMIT" was run using
"run_command_v_opt" to display information about the first bad
commit.

The goal of this patch is to avoid a "fork" and an "exec" call
when displaying that information.

To do that, we manually setup revision information as
"git diff-tree --pretty" would do it, and then use the
"log_tree_commit" function.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/bisect.c b/bisect.c
index 18f9fa406244e10893a7f328b942a723f9fa445f..2c14f4d61669582da51013ceddc260eec9a134ec 100644 (file)
--- a/bisect.c
+++ b/bisect.c
@@ -7,6 +7,7 @@
 #include "quote.h"
 #include "sha1-lookup.h"
 #include "run-command.h"
 #include "quote.h"
 #include "sha1-lookup.h"
 #include "run-command.h"

+#include "log-tree.h"

 #include "bisect.h"
 
 struct sha1_array {
 #include "bisect.h"
 
 struct sha1_array {


@@ -27,7 +28,6 @@ struct argv_array {
        int argv_alloc;
 };
 
        int argv_alloc;
 };
 

-static const char *argv_diff_tree[] = {"diff-tree", "--pretty", NULL, NULL};

 static const char *argv_checkout[] = {"checkout", "-q", NULL, "--", NULL};
 static const char *argv_show_branch[] = {"show-branch", NULL, NULL};
 
 static const char *argv_checkout[] = {"checkout", "-q", NULL, "--", NULL};
 static const char *argv_show_branch[] = {"show-branch", NULL, NULL};
 


@@ -815,6 +815,31 @@ static void check_good_are_ancestors_of_bad(const char *prefix)
                close(fd);
 }
 
                close(fd);
 }
 

+/*
+ * This does "git diff-tree --pretty COMMIT" without one fork+exec.
+ */
+static void show_diff_tree(const char *prefix, struct commit *commit)
+{
+       struct rev_info opt;
+
+       /* diff-tree init */
+       init_revisions(&opt, prefix);
+       git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
+       opt.abbrev = 0;
+       opt.diff = 1;
+
+       /* This is what "--pretty" does */
+       opt.verbose_header = 1;
+       opt.use_terminator = 0;
+       opt.commit_format = CMIT_FMT_DEFAULT;
+
+       /* diff-tree init */
+       if (!opt.diffopt.output_format)
+               opt.diffopt.output_format = DIFF_FORMAT_RAW;
+
+       log_tree_commit(&opt, commit);
+}
+

 /*
  * We use the convention that exiting with an exit code 10 means that
  * the bisection process finished successfully.
 /*
  * We use the convention that exiting with an exit code 10 means that
  * the bisection process finished successfully.


@@ -860,8 +885,7 @@ int bisect_next_all(const char *prefix)
        if (!hashcmp(bisect_rev, current_bad_sha1)) {
                exit_if_skipped_commits(tried, current_bad_sha1);
                printf("%s is first bad commit\n", bisect_rev_hex);
        if (!hashcmp(bisect_rev, current_bad_sha1)) {
                exit_if_skipped_commits(tried, current_bad_sha1);
                printf("%s is first bad commit\n", bisect_rev_hex);

-               argv_diff_tree[2] = bisect_rev_hex;
-               run_command_v_opt(argv_diff_tree, RUN_GIT_CMD);
+               show_diff_tree(prefix, revs.commits->item);

                /* This means the bisection process succeeded. */
                exit(10);
        }
                /* This means the bisection process succeeded. */
                exit(10);
        }