Skip to content

Commit

Permalink
subtree: fix argument handling in check_parents
Browse files Browse the repository at this point in the history
315a84f (subtree: use commits before rejoins for splits, 2018-09-28)
changed the signature of check_parents from 'check_parents [REV...]'
to 'check_parents PARENTS_EXPR INDENT'. In other words the variable list
of parent revisions became a list embedded in a string. However it
neglected to unpack the list again before sending it to cache_miss,
leading to incorrect calls whenever more than one parent was present.
This is the case whenever a merge commit is processed, with the end
result being a loss of performance from unecessary rechecks.

The indent parameter was subsequently removed in e9525a8 (subtree:
have $indent actually affect indentation, 2021-04-27), but the argument
handling bug remained.

For consistency, take multiple arguments in check_parents,
and pass all of them to cache_miss separately.

Signed-off-by: James Limbouris <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
jamesl-dm authored and gitster committed Jan 4, 2022
1 parent e9d7761 commit 3ce8888
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions contrib/subtree/git-subtree.sh
Original file line number Diff line number Diff line change
Expand Up @@ -296,10 +296,9 @@ cache_miss () {
done
}

# Usage: check_parents PARENTS_EXPR
# Usage: check_parents [REVS...]
check_parents () {
assert test $# = 1
missed=$(cache_miss "$1") || exit $?
missed=$(cache_miss "$@") || exit $?
local indent=$(($indent + 1))
for miss in $missed
do
Expand Down Expand Up @@ -753,7 +752,7 @@ process_split_commit () {
fi
createcount=$(($createcount + 1))
debug "parents: $parents"
check_parents "$parents"
check_parents $parents
newparents=$(cache_get $parents) || exit $?
debug "newparents: $newparents"

Expand Down

0 comments on commit 3ce8888

Please sign in to comment.