aboutsummaryrefslogtreecommitdiffstats
path: root/git-send-email.perl
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2024-06-19 03:00:16 +0000
committerJunio C Hamano <gitster@pobox.com>2024-06-20 10:35:24 -0700
commit5fadf1f93371204b82a02a30315f655a293aa7f5 (patch)
treed4c8f0e9ca56c402a1a23e10d59ce3d531e42626 /git-send-email.perl
parentmerge-ort: fix type of local 'clean' var in handle_content_merge () (diff)
downloadgit-5fadf1f93371204b82a02a30315f655a293aa7f5.tar.gz
git-5fadf1f93371204b82a02a30315f655a293aa7f5.zip
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>
Diffstat (limited to 'git-send-email.perl')
0 files changed, 0 insertions, 0 deletions