global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-10 09:08:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

contrib/subtree: reduce function side-effects

Browse Source 
`process_subtree_split_trailer()` communicates its return value
to the caller by setting a variable (`sub`) that is also defined
by the calling function. This is both unclear and encourages
side-effects.

Invoke this function in a sub-shell instead.

Signed-off-by: Colin Stagner <ask+git@howdoi.land>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Colin Stagner
2026-03-05 17:55:47 -06:00
committed by Junio C Hamano
parent 628a66ccf6
commit f8e90b972e
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/subtree/git-subtree.sh
View File

@@ -373,6 +373,10 @@ try_remove_previous () {
}
# Usage: process_subtree_split_trailer SPLIT_HASH MAIN_HASH [REPOSITORY]
#
# Parse SPLIT_HASH as a commit. If the commit is not found, fetches
# REPOSITORY and tries again. If found, prints full commit hash.
# Otherwise, dies.
process_subtree_split_trailer () {
assert test $# -ge 2
assert test $# -le 3
@@ -400,6 +404,7 @@ process_subtree_split_trailer () {
die "$fail_msg"
fi
fi
echo "${sub}"
}
# Usage: find_latest_squash DIR [REPOSITORY]
@@ -432,7 +437,7 @@ find_latest_squash () {
main="$b"
;;
git-subtree-split:)
process_subtree_split_trailer "$b" "$sq" "$repository"
sub="$(process_subtree_split_trailer "$b" "$sq" "$repository")" || exit 1
;;
END)
if test -n "$sub"
@@ -489,7 +494,7 @@ find_existing_splits () {
main="$b"
;;
git-subtree-split:)
process_subtree_split_trailer "$b" "$sq" "$repository"
sub="$(process_subtree_split_trailer "$b" "$sq" "$repository")" || exit 1
;;
END)
debug "Main is: '$main'"