diff --git a/lib/ulib/vcs b/lib/ulib/vcs index 54a72e1..8bfc336 100644 --- a/lib/ulib/vcs +++ b/lib/ulib/vcs @@ -607,7 +607,7 @@ function __git_init_ff() { s="$(git rev-parse --verify "$s")" || return 1 return 0 } -function __git_check_can_ff() { +function __git_can_ff() { [ "$1" == "$(git merge-base "$1" "$2")" ] } function git_is_ancestor() {