modules
/
nutools
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Intégration de la feature branch prel-tag

This commit is contained in:
Jephté Clain 2015-03-31 15:45:34 +04:00
parent 3e514d53f8 09c59d8650
commit 2a71a51b70
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/ulib/vcs
View File

@ -613,8 +613,8 @@ function git_ensure_cleancheckout() {
function __git_init_ff() {
o="${3:-origin}"
b="$1" s="${2:-remotes/$o/$1}"
b="$(git rev-parse --verify "$b")" || return 1
s="$(git rev-parse --verify "$s")" || return 1
b="$(git rev-parse --verify --quiet "$b")" || return 1
s="$(git rev-parse --verify --quiet "$s")" || return 1
return 0
}
function __git_can_ff() {
@ -658,8 +658,8 @@ function git_is_merged() {
# vérifier que les branches $1 et $2 ont un ancêtre commun, et que la
# branche $1 a été complètement fusionnée dans la branche destination $2
local b="$1" d="$2"
b="$(git rev-parse --verify "$b")" || return 1
d="$(git rev-parse --verify "$d")" || return 1
b="$(git rev-parse --verify --quiet "$b")" || return 1
d="$(git rev-parse --verify --quiet "$d")" || return 1
[ -n "$(git merge-base "$b" "$d")" ] || return 1
[ -z "$(git rev-list "$d..$b")" ]
}