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

Merge branch 'jl/subtree-check-parents-argument-passing-fix'

Browse Source 
Fix performance-releated bug in "git subtree" (in contrib/).

* jl/subtree-check-parents-argument-passing-fix:
  subtree: fix argument handling in check_parents
This commit is contained in:
Junio C Hamano
2022-01-10 11:52:54 -08:00
parent c0450ca098 3ce8888fb4
commit 9b6eda0785
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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