Browse Source

improved rev_is_descendant_of_branch() function

maint
Jakub Suder 15 years ago
parent
commit
6bd910a821
  1. 4
      git-subtree.sh

4
git-subtree.sh

@ -166,9 +166,9 @@ rev_is_descendant_of_branch() @@ -166,9 +166,9 @@ rev_is_descendant_of_branch()
newrev="$1"
branch="$2"
branch_hash=$(git rev-parse $branch)
match=$(git rev-list $newrev | grep $branch_hash)
match=$(git rev-list -1 $branch_hash ^$newrev)

if [ -n "$match" ]; then
if [ -z "$match" ]; then
return 0
else
return 1

Loading…
Cancel
Save