mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-ort: fix type of local 'clean' var in handle_content_merge ()

Browse Source 
handle_content_merge() returns an int.  Every caller of
handle_content_merge() expects an int.  However, we declare a local
variable 'clean' that we use for the return value to be unsigned.  To
make matters worse, we also assign 'clean' the return value of
merge_submodule() in one codepath, which is defined to return an int.
It seems that the only reason to have 'clean' be unsigned was to allow a
cutesy bit manipulation operation to be well-defined.  Fix the type of
the 'clean' local in handle_content_merge().

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren
2024-06-19 03:00:15 +00:00
committed by Junio C Hamano
parent 0b4f726cde
commit 9ed8e17d8a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
merge-ort.c
View File

@ -2109,7 +2109,7 @@ static int handle_content_merge(struct merge_options *opt,
* merges, which happens for example with rename/rename(2to1) and
* rename/add conflicts.
*/
unsigned clean = 1;
int clean = 1;
/*
* handle_content_merge() needs both files to be of the same type, i.e.
@ -2184,7 +2184,8 @@ static int handle_content_merge(struct merge_options *opt,
free(result_buf.ptr);
if (ret)
return -1;
clean &= (merge_status == 0);
if (merge_status > 0)
clean = 0;
path_msg(opt, INFO_AUTO_MERGING, 1, path, NULL, NULL, NULL,
_("Auto-merging %s"), path);
} else if (S_ISGITLINK(a->mode)) {