]> git.ipfire.org Git - thirdparty/git.git/commit
merge-ort: clearer propagation of failure-to-function from merge_submodule
authorElijah Newren <newren@gmail.com>
Wed, 19 Jun 2024 03:00:16 +0000 (03:00 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 20 Jun 2024 17:35:24 +0000 (10:35 -0700)
commit5fadf1f93371204b82a02a30315f655a293aa7f5
treed4c8f0e9ca56c402a1a23e10d59ce3d531e42626
parent9ed8e17d8a8c374529bb908c81f1a862f689b904
merge-ort: clearer propagation of failure-to-function from merge_submodule

The 'clean' member variable is somewhat of a tri-state (1 = clean, 0 =
conflicted, -1 = failure-to-determine), but we often like to think of
it as binary (ignoring the possibility of a negative value) and use
constructs like '!clean' to reflect this.  However, these constructs
can make codepaths more difficult to understand, unless we handle the
negative case early and return pre-emptively; do that in
handle_content_merge() to make the code a bit easier to read.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-ort.c