| Message ID | 20230824205456.1231371-3-gitster@pobox.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | code clean-up for rerere | expand |
diff --git a/rerere.c b/rerere.c index 73cdc8392f..4ce1270a94 100644 --- a/rerere.c +++ b/rerere.c @@ -454,7 +454,7 @@ static int handle_path(unsigned char *hash, struct rerere_io *io, int marker_siz /* * Scan the path for conflicts, do the "handle_path()" thing above, and - * return the number of conflict hunks found. + * return true iff conflict hunks were found. */ static int handle_file(struct index_state *istate, const char *path, unsigned char *hash, const char *output)
The return value from handle_path() is returned to the caller of handle_file() in the normal cases, and it is not the number of hunks. It is just a normal C Boolean, "do we (!=0) or do we not (0) have conflict?" plus "a negative return value signals an error". And all the callers of handle_file() understands its return value as such. Update the comment to match the reality after 221444f5 (rerere: only return whether a path has conflicts or not, 2018-08-05), which apparently forgot to update this comment when it turned the returned value of this function from the number of conflict hunks to a boolean plus error. Signed-off-by: Junio C Hamano <gitster@pobox.com> --- cc: Thomas Gummerer <t.gummerer@gmail.com> --- rerere.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)