diff options
| author |  Luke Shumaker <lukeshu@datawire.io> | 2021-04-27 15:17:33 -0600 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-04-28 16:47:17 +0900 |
| commit | f66430483645eb764135e5c79b753f1c09170ac8 (patch) | |
| tree | 465556a9d10b2300e7a54d75512ea77244201179 /contrib | |
| parent | subtree: drop support for git < 1.7 (diff) | |
| download | tgif-f66430483645eb764135e5c79b753f1c09170ac8.tar.xz | |
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>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/subtree/git-subtree.sh | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh index 4503564f7e..70e16b807b 100755 --- a/contrib/subtree/git-subtree.sh +++ b/contrib/subtree/git-subtree.sh @@ -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 |