From 5ff5b7d4e5775762cad79006da158d8b481bfe0c Mon Sep 17 00:00:00 2001
From: Jephte CLAIN <Jephte.Clain@univ-reunion.fr>
Date: Wed, 20 May 2015 09:48:26 +0400
Subject: [PATCH] =?UTF-8?q?d=C3=A9terminer=20les=20branches=20de=20topic:?=
 =?UTF-8?q?=20ignorer=20les=20branches=20avec=20un=20slash=20dans=20le=20n?=
 =?UTF-8?q?om?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/ulib/ptools | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

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