From ffa91952c2b7e5eacd9c38ef79c29c7bad004e00 Mon Sep 17 00:00:00 2001
From: Jephte CLAIN <Jephte.Clain@gmail.com>
Date: Sat, 28 Mar 2015 01:30:47 +0400
Subject: [PATCH] fast-forwarder si possible

---
 pdev | 1 +
 prel | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/pdev b/pdev
index 03309ae..4c2fc30 100755
--- a/pdev
+++ b/pdev
@@ -129,6 +129,7 @@ if [ "$action" == branch ]; then
     
     # Créer/basculer vers une feature branch
     git_ensure_cleancheckout
+    is_any_branch "$feature" develop feature || die "$release: ce n'est pas une feature branch"
     r=0
     if git_have_branch "$feature"; then
         git checkout "$feature" || r=$?
diff --git a/prel b/prel
index 0795ef0..466b8bc 100755
--- a/prel
+++ b/prel
@@ -247,6 +247,7 @@ if [ "$action" == checkout ]; then
         if [ -z "$UTOOLS_VCS_OFFLINE" ]; then
             git_track_branch "$release" "$origin"
         fi
+        git_fast_forward "$release" "" "$origin"
         exit 0
     fi
 
@@ -273,6 +274,10 @@ Vous allez créer la nouvelle branche de release ${COULEUR_VERTE}$release${COULE
             fi
         fi
     fi
+    if [ "$r" -eq 0 ]; then
+        # éventuellement fast-forwarder automatiquement
+        git_fast_forward "$release" "" "$origin"
+    fi
 
     if [ "$r" -eq 0 -a -n "$merge" ]; then
         set -- "$release"