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

Intégration de la branche release-1.11.0

This commit is contained in:
Jephté Clain 2015-05-22 11:41:37 +04:00
parent 2bd3e2052f 3def4cdc9d
commit 7b3aae26b6
4 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGES.txt
View File

@ -1,3 +1,10 @@
## Version 1.11.0 du 22/05/2015-11:41
2984052 Intégration de la branche quiet-completion
755cfa7 ne pas afficher les erreurs pour les fonctions de complétion de git
2b5eb2a Intégration de la branche pu
b004730 uproject update fait fetch puis merge, manuellement
## Version 1.10.0 du 20/05/2015-12:08 ## Version 1.10.0 du 20/05/2015-12:08
bf1d86a Intégration de la branche pu-auto-forward bf1d86a Intégration de la branche pu-auto-forward

2
VERSION.txt
View File

@ -1 +1 @@
1.10.0 1.11.0

6
lib/completion.d/ptools
View File

@ -3,8 +3,8 @@
function __pdev_branches() { function __pdev_branches() {
local prefix=origin/ local prefix=origin/
{ {
git for-each-ref refs/heads/ --format='%(refname:short)' git for-each-ref refs/heads/ --format='%(refname:short)' 2>/dev/null
git for-each-ref "refs/remotes/$prefix" --format='%(refname:short)' | grep -F "$prefix" | cut -c $((${#prefix} + 1))- git for-each-ref "refs/remotes/$prefix" --format='%(refname:short)' 2>/dev/null | grep -F "$prefix" | cut -c $((${#prefix} + 1))-
} | LANG=C sort -u | } | LANG=C sort -u |
grep -vF HEAD | grep -vF HEAD |
grep -vF master | grep -vF master |
@ -12,6 +12,6 @@ function __pdev_branches() {
grep -v '^hotfix-' grep -v '^hotfix-'
} }
function __prel_branches() { function __prel_branches() {
git for-each-ref --format='%(refname:short)' refs/heads | git for-each-ref --format='%(refname:short)' refs/heads 2>/dev/null |
grep -E '^(master$|release-)' grep -E '^(master$|release-)'
} }

26
lib/ulib/vcs
View File

@ -451,26 +451,42 @@ function git_update() {
return 1 return 1
} }
git pull "$@" || return if [ -z "$autoff" ]; then
if [ -n "$autoff" ]; then git pull "$@"
local orig_branch restore_branch rbranch return $?
fi
local orig_branch restore_branch remote rbranch pbranch
local -a branches local -a branches
git fetch -p "$@" || return
git_check_cleancheckout || return 0 git_check_cleancheckout || return 0
orig_branch="$(git_get_branch)" orig_branch="$(git_get_branch)"
array_from_lines branches "$(git_list_branches)" array_from_lines branches "$(git_list_branches)"
for branch in "${branches[@]}"; do for branch in "${branches[@]}"; do
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/}"
[ -n "$remote" -a -n "$rbranch" ] || continue [ -n "$remote" -a -n "$rbranch" ] || continue
if git_is_ancestor "$branch" "$rbranch"; then
if git_should_ff "$branch" "$rbranch"; then if git_should_ff "$branch" "$rbranch"; then
echo "Fast-forwarding $branch..." echo "* Fast-forwarding $branch -> $pbranch"
git checkout -q "$branch" git checkout -q "$branch"
git merge -q --ff-only "$rbranch" git merge -q --ff-only "$rbranch"
restore_branch=1 restore_branch=1
fi fi
else
if [ "$branch" == "$orig_branch" ]; then
echo "* Cannot fast-forward CURRENT branch $branch from $pbranch
Try to merge manually with: git merge $pbranch"
else
echo "* Cannot fast-forward local branch $branch from $pbranch
You can merge manually with: git checkout $branch; git merge $pbranch"
fi
fi
done done
[ -n "$restore_branch" ] && git checkout -q "$orig_branch" [ -n "$restore_branch" ] && git checkout -q "$orig_branch"
fi
return 0 return 0
} }
function git_push() { function git_push() {