undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bisect: simplify return code from bisect_checkout()

Browse Source 
The function was designed to return only BISECT_OK (0) or
BISECT_FAILED (-1) and no other values, but there were two issues:

 - The comment misspelled BISECT_FAILED as BISECT_FAILURE, even
   though the logic it described (i.e. any non-zero return should be
   reported as a single BISECT_FAILED) was correct.

 - It took the return value from run_command_v_opt(), and assumed it
   was either -1 or 1 upon error, which is not the case; it can relay
   errors from wait_or_whine(), which can report exit status of the
   child process.

Translate any error return from run_command_v_opt() to BISECT_FAILED,
and simplify the resulting code by losing the 'res' variable that is
no longer needed.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2021-07-28 10:07:02 -07:00
parent ffcb4e94d3
commit 1fcc40cd1d
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bisect.c
View File

@ -727,7 +727,6 @@ static int is_expected_rev(const struct object_id *oid)
static enum bisect_error bisect_checkout(const struct object_id *bisect_rev, int no_checkout) static enum bisect_error bisect_checkout(const struct object_id *bisect_rev, int no_checkout)
{ {
char bisect_rev_hex[GIT_MAX_HEXSZ + 1]; char bisect_rev_hex[GIT_MAX_HEXSZ + 1];
enum bisect_error res = BISECT_OK;
struct commit *commit; struct commit *commit;
struct pretty_print_context pp = {0}; struct pretty_print_context pp = {0};
struct strbuf commit_msg = STRBUF_INIT; struct strbuf commit_msg = STRBUF_INIT;
@ -740,14 +739,13 @@ static enum bisect_error bisect_checkout(const struct object_id *bisect_rev, int
update_ref(NULL, "BISECT_HEAD", bisect_rev, NULL, 0, update_ref(NULL, "BISECT_HEAD", bisect_rev, NULL, 0,
UPDATE_REFS_DIE_ON_ERR); UPDATE_REFS_DIE_ON_ERR);
} else { } else {
res = run_command_v_opt(argv_checkout, RUN_GIT_CMD); if (run_command_v_opt(argv_checkout, RUN_GIT_CMD))
if (res)
/* /*
* Errors in `run_command()` itself, signaled by res < 0, * Errors in `run_command()` itself, signaled by res < 0,
* and errors in the child process, signaled by res > 0 * and errors in the child process, signaled by res > 0
* can both be treated as regular BISECT_FAILURE (-1). * can both be treated as regular BISECT_FAILED (-1).
*/ */
return -abs(res); return BISECT_FAILED;
} }
commit = lookup_commit_reference(the_repository, bisect_rev); commit = lookup_commit_reference(the_repository, bisect_rev);
@ -755,7 +753,7 @@ static enum bisect_error bisect_checkout(const struct object_id *bisect_rev, int
fputs(commit_msg.buf, stdout); fputs(commit_msg.buf, stdout);
strbuf_release(&commit_msg); strbuf_release(&commit_msg);
return -abs(res); return BISECT_OK;
} }
static struct commit *get_commit_reference(struct repository *r, static struct commit *get_commit_reference(struct repository *r,