mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-08 08:56:10 +02:00
Code

subtree: use `git merge-base --is-ancestor` 

Instead of writing a slow `rev_is_descendant_of_branch $a $b` function
in shell, just use the fast `git merge-base --is-ancestor $b $a`.

Signed-off-by: Luke Shumaker <lukeshu@datawire.io>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Luke Shumaker 2021-04-27 15:17:33 -06:00 committed by Junio C Hamano
parent 8dc3240f5f
commit f664304836
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -280,20 +280,6 @@ rev_exists () {
fi
}
rev_is_descendant_of_branch () {
newrev="$1"
branch="$2"
branch_hash=$(git rev-parse "$branch")
match=$(git rev-list -1 "$branch_hash" "^$newrev")
if test -z "$match"
then
return 0
else
return 1
fi
}
# if a commit doesn't have a parent, this might not work. But we only want
# to remove the parent from the rev-list, and since it doesn't exist, it won't
# be there anyway, so do nothing in that case.
@ -811,7 +797,7 @@ cmd_split () {
then
if rev_exists "refs/heads/$branch"
then
if ! rev_is_descendant_of_branch "$latest_new" "$branch"
if ! git merge-base --is-ancestor "$branch" "$latest_new"
then
die "Branch '$branch' is not an ancestor of commit '$latest_new'."
fi