From c3683a50cd79edae94e11a4c00f545e375ab763a Mon Sep 17 00:00:00 2001 From: Jephte Clain Date: Fri, 27 Mar 2015 00:17:29 +0400 Subject: [PATCH] bug --- lib/ulib/vcs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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() {