| commit | 6bd910a82155ae3def5cf38acb27d36a192c449e | [log] [tgz] |
|---|---|---|
| author | Jakub Suder <jakub.suder@gmail.com> | Tue Jan 12 23:34:52 2010 +0100 |
| committer | Jakub Suder <jakub.suder@gmail.com> | Tue Jan 12 23:34:52 2010 +0100 |
| tree | af7dc6e14f795f648cc0aab7575d4223607e304d | |
| parent | 4a6ea5ce301c9844722bfdb9291bd9cb7797d9ed [diff] [blame] |
improved rev_is_descendant_of_branch() function
diff --git a/git-subtree.sh b/git-subtree.sh index 48bc570..66ce251 100755 --- a/git-subtree.sh +++ b/git-subtree.sh
@@ -166,9 +166,9 @@ 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