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

pu: autoriser fast-forward même en cas de modifications locales

This commit is contained in:
Jephte CLAIN 2016-02-15 21:09:30 +04:00
parent 1c397e8999
commit ad06535c8d
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/ulib/vcs
View File

@ -466,16 +466,10 @@ function git_update() {
remote="$(git_get_branch_remote "$branch")" remote="$(git_get_branch_remote "$branch")"
rbranch="$(git_get_branch_rbranch "$branch" "$remote")" rbranch="$(git_get_branch_rbranch "$branch" "$remote")"
pbranch="${rbranch#refs/remotes/}" pbranch="${rbranch#refs/remotes/}"
if [ -z "$remote" -o -z "$rbranch" ]; then if git merge -q --ff-only "$rbranch"; then
echo "Note: there are uncommitted local changes" echo "* There are uncommitted local changes. Only current branch were updated"
return 0 echo " (CURRENT branch $branch were fast-forwarded from $pbranch)"
elif git_is_ancestor "$branch" "$rbranch"; then
echo "* Uncommitted changes, unwilling to fast-forward local branch $branch from $pbranch"
else
echo "* Cannot fast-forward local branch $branch from $pbranch"
echo " (and there are uncommitted local changes)"
fi fi
echo "Try to merge manually with: git merge $pbranch"
return 0 return 0
fi fi