Skip to content

Commit

Permalink
bisect: Honor log.date
Browse files Browse the repository at this point in the history
When bisect finds the target commit to display, it calls git diff-tree
to do so. This is a plumbing command that is not affected by the user's
log.date setting. Switch to instead use "git show", which does honor
it.

Reported-by: Michael Osipov <michael.osipov@innomotics.com>
Signed-off-By: Peter Krefting <peter@softwolves.pp.se>
  • Loading branch information
nafmo committed Mar 28, 2024
1 parent 0d464a4 commit 2f27ae6
Showing 1 changed file with 11 additions and 16 deletions.
27 changes: 11 additions & 16 deletions bisect.c
Original file line number Diff line number Diff line change
Expand Up @@ -959,23 +959,18 @@ static enum bisect_error check_good_are_ancestors_of_bad(struct repository *r,
}

/*
* This does "git diff-tree --pretty COMMIT" without one fork+exec.
* Runs "git show" to display a commit
*/
static void show_diff_tree(struct repository *r,
const char *prefix,
struct commit *commit)
static void show_commit(struct commit *commit)
{
const char *argv[] = {
"diff-tree", "--pretty", "--stat", "--summary", "--cc", NULL
};
struct rev_info opt;

git_config(git_diff_ui_config, NULL);
repo_init_revisions(r, &opt, prefix);

setup_revisions(ARRAY_SIZE(argv) - 1, argv, &opt, NULL);
log_tree_commit(&opt, commit);
release_revisions(&opt);
struct child_process show = CHILD_PROCESS_INIT;

strvec_pushl(&show.args, "show", "--pretty=medium", "--stat", "--no-abbrev-commit", "--no-patch",
oid_to_hex(&commit->object.oid), NULL);
show.git_cmd = 1;
if (run_command(&show))
die(_("unable to start 'show' for object '%s'"),
oid_to_hex(&commit->object.oid));
}

/*
Expand Down Expand Up @@ -1092,7 +1087,7 @@ enum bisect_error bisect_next_all(struct repository *r, const char *prefix)
printf("%s is the first %s commit\n", oid_to_hex(bisect_rev),
term_bad);

show_diff_tree(r, prefix, revs.commits->item);
show_commit(revs.commits->item);
/*
* This means the bisection process succeeded.
* Using BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND (-10)
Expand Down

0 comments on commit 2f27ae6

Please sign in to comment.