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

Intégration de la branche ptools-maj-topic

This commit is contained in:
Jephté Clain 2015-05-20 09:48:29 +04:00
parent b19da301dd 5ff5b7d4e5
commit 8baabeaad0
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/ulib/ptools
View File

@ -37,10 +37,8 @@ function is_any_branch() {
[ "$branch" == "develop" ] && continue [ "$branch" == "develop" ] && continue
[[ "$branch" == release-* ]] && continue [[ "$branch" == release-* ]] && continue
[[ "$branch" == hotfix-* ]] && continue [[ "$branch" == hotfix-* ]] && continue
if [ -n "$annex" ]; then [ -n "$annex" -a "$branch" == "git-annex" ] && continue
[ "$branch" == "git-annex" ] && continue [[ "$branch" == */* ]] && continue
[[ "$branch" == synced/* ]] && continue
fi
return 0 return 0
;; ;;
-m|-master) -m|-master)
@ -61,10 +59,8 @@ function is_any_branch() {
[ "$branch" == "develop" ] && continue [ "$branch" == "develop" ] && continue
[[ "$branch" == release-* ]] && continue [[ "$branch" == release-* ]] && continue
[[ "$branch" == hotfix-* ]] && continue [[ "$branch" == hotfix-* ]] && continue
if [ -n "$annex" ]; then [ -n "$annex" -a "$branch" == "git-annex" ] && continue
[ "$branch" == "git-annex" ] && continue [[ "$branch" == */* ]] && continue
[[ "$branch" == synced/* ]] && continue
fi
return 1 return 1
;; ;;
esac esac
@ -92,9 +88,9 @@ function list_feature_branches() {
grep -vF develop | grep -vF develop |
grep -v '^release-' | grep -v '^release-' |
grep -v '^hotfix-' | grep -v '^hotfix-' |
grep -v '/' |
if git_have_annex; then if git_have_annex; then
grep -vF git-annex | grep -vF git-annex
grep -v '^synced/'
else else
cat cat
fi fi