David Turner <[email protected]> writes:
> Instead of manually writing a pseudoref (in one case) and shelling out
> to git update-ref (in another), use the update_ref function. This
> is much simpler.
>
> Signed-off-by: David Turner <[email protected]>
> ---
> bisect.c | 37 ++++++++-----------------------------
> 1 file changed, 8 insertions(+), 29 deletions(-)
Mistitled? I can do s/rebase/bisect/ at my end if that is all
needed.
>
> diff --git a/bisect.c b/bisect.c
> index 857cf59..33ac88d 100644
> --- a/bisect.c
> +++ b/bisect.c
> @@ -19,7 +19,6 @@ static struct object_id *current_bad_oid;
>
> static const char *argv_checkout[] = {"checkout", "-q", NULL, "--", NULL};
> static const char *argv_show_branch[] = {"show-branch", NULL, NULL};
> -static const char *argv_update_ref[] = {"update-ref", "--no-deref",
> "BISECT_HEAD", NULL, NULL};
>
> static const char *term_bad;
> static const char *term_good;
> @@ -675,34 +674,16 @@ static int is_expected_rev(const struct object_id *oid)
> return res;
> }
>
> -static void mark_expected_rev(char *bisect_rev_hex)
> -{
> - int len = strlen(bisect_rev_hex);
> - const char *filename = git_path("BISECT_EXPECTED_REV");
> - int fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0600);
> -
> - if (fd < 0)
> - die_errno("could not create file '%s'", filename);
> -
> - bisect_rev_hex[len] = '\n';
> - write_or_die(fd, bisect_rev_hex, len + 1);
> - bisect_rev_hex[len] = '\0';
> -
> - if (close(fd) < 0)
> - die("closing file %s: %s", filename, strerror(errno));
> -}
> -
> -static int bisect_checkout(char *bisect_rev_hex, int no_checkout)
> +static int bisect_checkout(const unsigned char *bisect_rev, int no_checkout)
> {
> + char bisect_rev_hex[GIT_SHA1_HEXSZ + 1];
>
> - mark_expected_rev(bisect_rev_hex);
> + memcpy(bisect_rev_hex, sha1_to_hex(bisect_rev), GIT_SHA1_HEXSZ + 1);
> + update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev, NULL, 0,
> UPDATE_REFS_DIE_ON_ERR);
>
> argv_checkout[2] = bisect_rev_hex;
> if (no_checkout) {
> - argv_update_ref[3] = bisect_rev_hex;
> - if (run_command_v_opt(argv_update_ref, RUN_GIT_CMD))
> - die("update-ref --no-deref HEAD failed on %s",
> - bisect_rev_hex);
> + update_ref(NULL, "BISECT_HEAD", bisect_rev, NULL, 0,
> UPDATE_REFS_DIE_ON_ERR);
> } else {
> int res;
> res = run_command_v_opt(argv_checkout, RUN_GIT_CMD);
> @@ -804,7 +785,7 @@ static void check_merge_bases(int no_checkout)
> handle_skipped_merge_base(mb);
> } else {
> printf("Bisecting: a merge base must be tested\n");
> - exit(bisect_checkout(sha1_to_hex(mb), no_checkout));
> + exit(bisect_checkout(mb, no_checkout));
> }
> }
>
> @@ -948,7 +929,6 @@ int bisect_next_all(const char *prefix, int no_checkout)
> struct commit_list *tried;
> int reaches = 0, all = 0, nr, steps;
> const unsigned char *bisect_rev;
> - char bisect_rev_hex[GIT_SHA1_HEXSZ + 1];
>
> read_bisect_terms(&term_bad, &term_good);
> if (read_bisect_refs())
> @@ -986,11 +966,10 @@ int bisect_next_all(const char *prefix, int no_checkout)
> }
>
> bisect_rev = revs.commits->item->object.sha1;
> - memcpy(bisect_rev_hex, sha1_to_hex(bisect_rev), GIT_SHA1_HEXSZ + 1);
>
> if (!hashcmp(bisect_rev, current_bad_oid->hash)) {
> exit_if_skipped_commits(tried, current_bad_oid);
> - printf("%s is the first %s commit\n", bisect_rev_hex,
> + printf("%s is the first %s commit\n", sha1_to_hex(bisect_rev),
> term_bad);
> show_diff_tree(prefix, revs.commits->item);
> /* This means the bisection process succeeded. */
> @@ -1003,7 +982,7 @@ int bisect_next_all(const char *prefix, int no_checkout)
> "(roughly %d step%s)\n", nr, (nr == 1 ? "" : "s"),
> steps, (steps == 1 ? "" : "s"));
>
> - return bisect_checkout(bisect_rev_hex, no_checkout);
> + return bisect_checkout(bisect_rev, no_checkout);
> }
>
> static inline int log2i(int n)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
