git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v5 04/16] bisect--helper: simplify exit code computation

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 28, 2022, 06:43 UTC
Message-ID
<xmqqpmgkvpee.fsf@gitster.g>
In-Reply-To
<9ab30552c6ae6a5d0a85d7a7bbdd10af4a4cf7ec.1661604264.git.gitgitgadget@gmail.com>

"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes:

Show 6 quoted lines
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> We _already_ have a function to determine whether a given `enum
> bisect_error` value is non-zero but still _actually_ indicates success.
>
> Let's use it instead of duplicating the logic.
Yeah, looking very good.
Show 24 quoted lines
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
>  builtin/bisect--helper.c | 9 +--------
>  1 file changed, 1 insertion(+), 8 deletions(-)
>
> diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
> index aa94c25ec73..2f9c7f54f3f 100644
> --- a/builtin/bisect--helper.c
> +++ b/builtin/bisect--helper.c
> @@ -1380,12 +1380,5 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
>  	}
>  	free_terms(&terms);
>  
> -	/*
> -	 * Handle early success
> -	 * From check_merge_bases > check_good_are_ancestors_of_bad > bisect_next_all
> -	 */
> -	if ((res == BISECT_INTERNAL_SUCCESS_MERGE_BASE) || (res == BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND))
> -		res = BISECT_OK;
> -
> -	return -res;
> +	return is_bisect_success(res) ? 0 : -res;
>  }
Previous: Johannes Schindelin via GitGitGadgetNext: Johannes Schindelin via GitGitGadget
Message 99 of 147 in “Finish converting git bisect into a built-in”
  1. 00/11 Finish converting git bisect into a built-inJohannes Schindelin via GitGitGadget, Jan 28, 2022
  2. 01/11 bisect run: fix the error messageJohannes Schindelin via GitGitGadget, Jan 28, 2022
  3. Elijah NewrenFeb 8, 2022
  4. Johannes SchindelinFeb 22, 2022
  5. 02/11 bisect--helper: retire the --no-log optionJohannes Schindelin via GitGitGadget, Jan 28, 2022
  6. 03/11 bisect--helper: really retire --bisect-next-checkJohannes Schindelin via GitGitGadget, Jan 28, 2022
  7. 04/11 bisect--helper: really retire `--bisect-autostart`Johannes Schindelin via GitGitGadget, Jan 28, 2022
  8. 05/11 bisect--helper: align the sub-command order with git-bisect.shJohannes Schindelin via GitGitGadget, Jan 28, 2022
  9. 08/11 bisect--helper: using `--bisect-state` without an argument is a bugJohannes Schindelin via GitGitGadget, Jan 28, 2022
  10. Ævar Arnfjörð BjarmasonJan 29, 2022
  11. Elijah NewrenFeb 9, 2022
  12. 06/11 bisect--helper: make `--bisect-state` optionalJohannes Schindelin via GitGitGadget, Jan 28, 2022
  13. Elijah NewrenFeb 8, 2022
  14. Johannes SchindelinFeb 22, 2022
  15. Junio C HamanoFeb 9, 2022
  16. Johannes SchindelinFeb 22, 2022
  17. 09/11 Turn `git bisect` into a full built-in.Johannes Schindelin via GitGitGadget, Jan 28, 2022
  18. Ævar Arnfjörð BjarmasonJan 29, 2022
  19. 07/11 bisect: move even the option parsing to `bisect--helper`Johannes Schindelin via GitGitGadget, Jan 28, 2022
  20. Ævar Arnfjörð BjarmasonJan 29, 2022
  21. Elijah NewrenFeb 9, 2022
  22. Johannes SchindelinFeb 22, 2022
  23. 11/11 bisect: no longer try to clean up left-over `.git/head-name` filesJohannes Schindelin via GitGitGadget, Jan 28, 2022
  24. 10/11 bisect: remove Cogito-related codeJohannes Schindelin via GitGitGadget, Jan 28, 2022
  25. Elijah NewrenJan 30, 2022
  26. Elijah NewrenFeb 9, 2022
  27. Johannes SchindelinFeb 22, 2022
  28. 00/14 Finish converting git bisect into a built-inJohannes Schindelin via GitGitGadget, Feb 22, 2022
  29. 01/14 bisect run: fix the error messageJohannes Schindelin via GitGitGadget, Feb 22, 2022
  30. 02/14 bisect: avoid double-quoting when printing the failed commandJohannes Schindelin via GitGitGadget, Feb 22, 2022
  31. 03/14 bisect--helper: retire the --no-log optionJohannes Schindelin via GitGitGadget, Feb 22, 2022
  32. 04/14 bisect--helper: really retire --bisect-next-checkJohannes Schindelin via GitGitGadget, Feb 22, 2022
  33. 05/14 bisect--helper: really retire `--bisect-autostart`Johannes Schindelin via GitGitGadget, Feb 22, 2022
  34. 06/14 bisect--helper: using `--bisect-state` without an argument is a bugJohannes Schindelin via GitGitGadget, Feb 22, 2022
  35. 07/14 bisect--helper: align the sub-command order with git-bisect.shJohannes Schindelin via GitGitGadget, Feb 22, 2022
  36. 08/14 bisect--helper: make `--bisect-state` optionalJohannes Schindelin via GitGitGadget, Feb 22, 2022
  37. 09/14 bisect--helper: move the `BISECT_STATE` case to the endJohannes Schindelin via GitGitGadget, Feb 22, 2022
  38. 10/14 bisect--helper: return only correct exit codes in `cmd_*()`Johannes Schindelin via GitGitGadget, Feb 22, 2022
  39. 14/14 bisect: no longer try to clean up left-over `.git/head-name` filesJohannes Schindelin via GitGitGadget, Feb 22, 2022
  40. 13/14 bisect: remove Cogito-related codeJohannes Schindelin via GitGitGadget, Feb 22, 2022
  41. 11/14 bisect: move even the option parsing to `bisect--helper`Johannes Schindelin via GitGitGadget, Feb 22, 2022
  42. Ævar Arnfjörð BjarmasonFeb 23, 2022
  43. Johannes SchindelinFeb 25, 2022
  44. Ævar Arnfjörð BjarmasonFeb 25, 2022
  45. 12/14 Turn `git bisect` into a full built-inJohannes Schindelin via GitGitGadget, Feb 22, 2022
  46. Elijah NewrenFeb 23, 2022
  47. Johannes SchindelinFeb 25, 2022
  48. Junio C HamanoFeb 23, 2022
  49. Johannes SchindelinFeb 25, 2022
  50. Ævar Arnfjörð BjarmasonFeb 25, 2022
  51. 00/15 Finish converting git bisect into a built-inJohannes Schindelin via GitGitGadget, May 21, 2022
  52. 01/15 bisect run: fix the error messageJohannes Schindelin via GitGitGadget, May 21, 2022
  53. 02/15 bisect: avoid double-quoting when printing the failed commandJohannes Schindelin via GitGitGadget, May 21, 2022
  54. 03/15 bisect--helper: retire the --no-log optionJohannes Schindelin via GitGitGadget, May 21, 2022
  55. 05/15 bisect--helper: really retire `--bisect-autostart`Johannes Schindelin via GitGitGadget, May 21, 2022
  56. 06/15 bisect--helper: using `--bisect-state` without an argument is a bugJohannes Schindelin via GitGitGadget, May 21, 2022
  57. 04/15 bisect--helper: really retire --bisect-next-checkJohannes Schindelin via GitGitGadget, May 21, 2022
  58. 07/15 bisect--helper: align the sub-command order with git-bisect.shJohannes Schindelin via GitGitGadget, May 21, 2022
  59. 08/15 bisect--helper: make `--bisect-state` optionalJohannes Schindelin via GitGitGadget, May 21, 2022
  60. 10/15 bisect--helper: return only correct exit codes in `cmd_*()`Johannes Schindelin via GitGitGadget, May 21, 2022
  61. Ævar Arnfjörð BjarmasonMay 21, 2022
  62. 09/15 bisect--helper: move the `BISECT_STATE` case to the endJohannes Schindelin via GitGitGadget, May 21, 2022
  63. 12/15 bisect: teach the `bisect--helper` command to show the correct usage stringsJohannes Schindelin via GitGitGadget, May 21, 2022
  64. 11/15 bisect: move even the command-line parsing to `bisect--helper`Johannes Schindelin via GitGitGadget, May 21, 2022
  65. Ævar Arnfjörð BjarmasonMay 21, 2022
  66. 14/15 bisect: remove Cogito-related codeJohannes Schindelin via GitGitGadget, May 21, 2022
  67. 13/15 Turn `git bisect` into a full built-inJohannes Schindelin via GitGitGadget, May 21, 2022
  68. 15/15 bisect: no longer try to clean up left-over `.git/head-name` filesJohannes Schindelin via GitGitGadget, May 21, 2022
  69. Bagas SanjayaMay 22, 2022
  70. Ævar Arnfjörð BjarmasonMay 23, 2022
  71. 00/16 Finish converting git bisect into a built-inJohannes Schindelin via GitGitGadget, Jun 27, 2022
  72. 02/16 bisect run: fix the error messageJohannes Schindelin via GitGitGadget, Jun 27, 2022
  73. 01/16 bisect: verify that a bogus option won't try to start a bisectionJohannes Schindelin via GitGitGadget, Jun 27, 2022
  74. Junio C HamanoJun 28, 2022
  75. 04/16 bisect--helper: retire the --no-log optionJohannes Schindelin via GitGitGadget, Jun 27, 2022
  76. 05/16 bisect--helper: really retire --bisect-next-checkJohannes Schindelin via GitGitGadget, Jun 27, 2022
  77. 03/16 bisect: avoid double-quoting when printing the failed commandJohannes Schindelin via GitGitGadget, Jun 27, 2022
  78. 07/16 bisect--helper: using `--bisect-state` without an argument is a bugJohannes Schindelin via GitGitGadget, Jun 27, 2022
  79. 06/16 bisect--helper: really retire `--bisect-autostart`Johannes Schindelin via GitGitGadget, Jun 27, 2022
  80. 08/16 bisect--helper: align the sub-command order with git-bisect.shJohannes Schindelin via GitGitGadget, Jun 27, 2022
  81. 09/16 bisect--helper: make `--bisect-state` optionalJohannes Schindelin via GitGitGadget, Jun 27, 2022
  82. 10/16 bisect--helper: move the `BISECT_STATE` case to the endJohannes Schindelin via GitGitGadget, Jun 27, 2022
  83. 11/16 bisect--helper: return only correct exit codes in `cmd_*()`Johannes Schindelin via GitGitGadget, Jun 27, 2022
  84. Ævar Arnfjörð BjarmasonJun 27, 2022
  85. 12/16 bisect: teach the `bisect--helper` command to show the correct usage stringsJohannes Schindelin via GitGitGadget, Jun 27, 2022
  86. Junio C HamanoJun 27, 2022
  87. 14/16 Turn `git bisect` into a full built-inJohannes Schindelin via GitGitGadget, Jun 27, 2022
  88. Junio C HamanoJun 27, 2022
  89. 16/16 bisect: no longer try to clean up left-over `.git/head-name` filesJohannes Schindelin via GitGitGadget, Jun 27, 2022
  90. 13/16 bisect: move even the command-line parsing to `bisect--helper`Johannes Schindelin via GitGitGadget, Jun 27, 2022
  91. 15/16 bisect: remove Cogito-related codeJohannes Schindelin via GitGitGadget, Jun 27, 2022
  92. Junio C HamanoJun 27, 2022
  93. Ævar Arnfjörð BjarmasonJun 27, 2022
  94. 00/16 Finish converting git bisect into a built-inJohannes Schindelin via GitGitGadget, Aug 27, 2022
  95. 01/16 bisect--helper: retire the --no-log optionJohannes Schindelin via GitGitGadget, Aug 27, 2022
  96. 03/16 bisect--helper: really retire `--bisect-autostart`Johannes Schindelin via GitGitGadget, Aug 27, 2022
  97. 02/16 bisect--helper: really retire --bisect-next-checkJohannes Schindelin via GitGitGadget, Aug 27, 2022
  98. 04/16 bisect--helper: simplify exit code computationJohannes Schindelin via GitGitGadget, Aug 27, 2022
  99. Junio C HamanoAug 28, 2022
  100. 05/16 bisect--helper: make `terms` an explicit singletonJohannes Schindelin via GitGitGadget, Aug 27, 2022
  101. Junio C HamanoAug 28, 2022
  102. Johannes SchindelinAug 29, 2022
  103. Junio C HamanoAug 29, 2022
  104. Ævar Arnfjörð BjarmasonAug 29, 2022
  105. Johannes SchindelinAug 29, 2022
  106. Junio C HamanoAug 29, 2022
  107. 06/16 bisect--helper: make the order consistently `argc, argv`Johannes Schindelin via GitGitGadget, Aug 27, 2022
  108. Junio C HamanoAug 28, 2022
  109. 07/16 bisect--helper: migrate to OPT_SUBCOMMAND()Johannes Schindelin via GitGitGadget, Aug 27, 2022
  110. Ævar Arnfjörð BjarmasonAug 29, 2022
  111. Johannes SchindelinAug 30, 2022
  112. 08/16 bisect: verify that a bogus option won't try to start a bisectionJohannes Schindelin via GitGitGadget, Aug 27, 2022
  113. 09/16 bisect run: fix the error messageJohannes Schindelin via GitGitGadget, Aug 27, 2022
  114. Junio C HamanoAug 28, 2022
  115. Johannes SchindelinAug 29, 2022
  116. 10/16 bisect: avoid double-quoting when printing the failed commandJohannes Schindelin via GitGitGadget, Aug 27, 2022
  117. 11/16 bisect--helper: calling `bisect_state()` without an argument is a bugJohannes Schindelin via GitGitGadget, Aug 27, 2022
  118. Ævar Arnfjörð BjarmasonAug 29, 2022
  119. Johannes SchindelinAug 30, 2022
  120. 15/16 bisect: remove Cogito-related codeJohannes Schindelin via GitGitGadget, Aug 27, 2022
  121. 14/16 Turn `git bisect` into a full built-inJohannes Schindelin via GitGitGadget, Aug 27, 2022
  122. 13/16 bisect: move even the command-line parsing to `bisect--helper`Johannes Schindelin via GitGitGadget, Aug 27, 2022
  123. 12/16 bisect--helper: make `state` optionalJohannes Schindelin via GitGitGadget, Aug 27, 2022
  124. 16/16 bisect: no longer try to clean up left-over `.git/head-name` filesJohannes Schindelin via GitGitGadget, Aug 27, 2022
  125. 00/16 Finish converting git bisect into a built-inJohannes Schindelin via GitGitGadget, Aug 30, 2022
  126. 01/16 bisect--helper: retire the --no-log optionJohannes Schindelin via GitGitGadget, Aug 30, 2022
  127. 02/16 bisect--helper: really retire --bisect-next-checkJohannes Schindelin via GitGitGadget, Aug 30, 2022
  128. 03/16 bisect--helper: really retire `--bisect-autostart`Johannes Schindelin via GitGitGadget, Aug 30, 2022
  129. 04/16 bisect--helper: simplify exit code computationJohannes Schindelin via GitGitGadget, Aug 30, 2022
  130. 06/16 bisect--helper: make the order consistently `argc, argv`Johannes Schindelin via GitGitGadget, Aug 30, 2022
  131. 05/16 bisect--helper: make `terms` an explicit singletonJohannes Schindelin via GitGitGadget, Aug 30, 2022
  132. Junio C HamanoAug 30, 2022
  133. Junio C HamanoAug 30, 2022
  134. 07/16 bisect--helper: migrate to OPT_SUBCOMMAND()Johannes Schindelin via GitGitGadget, Aug 30, 2022
  135. 08/16 bisect: verify that a bogus option won't try to start a bisectionJohannes Schindelin via GitGitGadget, Aug 30, 2022
  136. 09/16 bisect run: fix the error messageJohannes Schindelin via GitGitGadget, Aug 30, 2022
  137. 10/16 bisect: avoid double-quoting when printing the failed commandJohannes Schindelin via GitGitGadget, Aug 30, 2022
  138. 11/16 bisect--helper: calling `bisect_state()` without an argument is a bugJohannes Schindelin via GitGitGadget, Aug 30, 2022
  139. 12/16 bisect--helper: make `state` optionalJohannes Schindelin via GitGitGadget, Aug 30, 2022
  140. 13/16 bisect: move even the command-line parsing to `bisect--helper`Johannes Schindelin via GitGitGadget, Aug 30, 2022
  141. 14/16 Turn `git bisect` into a full built-inJohannes Schindelin via GitGitGadget, Aug 30, 2022
  142. 15/16 bisect: remove Cogito-related codeJohannes Schindelin via GitGitGadget, Aug 30, 2022
  143. 16/16 bisect: no longer try to clean up left-over `.git/head-name` filesJohannes Schindelin via GitGitGadget, Aug 30, 2022
  144. Junio C HamanoSep 13, 2022
  145. Fwd: [PATCH 00/11] Finish converting git bisect into a built-inMiriam R., Jan 28, 2022
  146. Johannes SchindelinJan 28, 2022
  147. Miriam R.Jan 28, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.