From 881bcde1e3dd009f1cc563325b02f0f3eff3452e Mon Sep 17 00:00:00 2001 From: Jephte CLAIN Date: Sat, 28 Mar 2015 01:11:24 +0400 Subject: [PATCH] tenir compte de la valeur de origin --- lib/ulib/ptools | 12 ++++++------ pdev | 2 +- prel | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/ulib/ptools b/lib/ulib/ptools index 1083dce..d1f62fb 100644 --- a/lib/ulib/ptools +++ b/lib/ulib/ptools @@ -69,16 +69,16 @@ function is_hotfix_branch() { is_any_branch "$1" hotfix; } function is_feature_branch() { is_any_branch "$1" feature; } function list_release_branches() { - local p="$1" - git_list_${p:+p}branches | grep '^release-' + local origin="$1" + git_list_${origin:+p}branches "$origin" | grep '^release-' } function list_hotfix_branches() { - local p="$1" - git_list_${p:+p}branches | grep '^hotfix-' + local origin="$1" + git_list_${origin:+p}branches "$origin" | grep '^hotfix-' } function list_feature_branches() { - local p="$1" - git_list_${p:+p}branches | + local origin="$1" + git_list_${origin:+p}branches "$origin" | grep -vF master | grep -vF develop | grep -v '^release-' | diff --git a/pdev b/pdev index 7ef5f51..03309ae 100755 --- a/pdev +++ b/pdev @@ -103,7 +103,7 @@ if [ "$action" == branch ]; then source="${2:-develop}" if [ -z "$feature" ]; then - setx -a branches=list_feature_branches p + setx -a branches=list_feature_branches "$origin" if [ ${#branches[*]} -eq 0 ]; then # En l'absence de feature branch, basculer sur develop diff --git a/prel b/prel index 8183e46..86a37a0 100755 --- a/prel +++ b/prel @@ -162,7 +162,7 @@ if [ "$action" == update ]; then else # sinon, prendre une décision en fonction des branches de release # qui existent déjà - setx -a branches=list_release_branches p + setx -a branches=list_release_branches "$origin" if [ ${#branches[*]} -eq 0 ]; then # en l'absence de branche de release, proposer d'en créer une incversion=menu @@ -220,7 +220,7 @@ if [ "$action" == checkout ]; then source="${2:-develop}" if [ -z "$release" ]; then - setx -a branches=list_release_branches p + setx -a branches=list_release_branches "$origin" if [ ${#branches[*]} -eq 0 ]; then # en l'absence de branche de release, basculer sur master