From 743e17ba0fd79124d7f53f5b5793dcd23886c99f Mon Sep 17 00:00:00 2001
From: Jephte Clain <Jephte.Clain@univ-reunion.fr>
Date: Fri, 27 Mar 2015 00:16:03 +0400
Subject: [PATCH] fast-forwarder automatiquement la branche vers laquelle on
 bascule

---
 pdev | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pdev b/pdev
index 0cfa33d..9f9dafd 100755
--- a/pdev
+++ b/pdev
@@ -123,13 +123,15 @@ if [ "$action" == branch ]; then
         if [ -z "$UTOOLS_VCS_OFFLINE" ]; then
             git_track_branch "$feature" "$origin"
         fi
+        git_fast_forward "$feature" "" "$origin"
         exit 0
     fi
     
     # Créer/basculer vers une feature branch
     git_ensure_cleancheckout
+    r=0
     if git_have_branch "$feature"; then
-        git checkout "$feature"
+        git checkout "$feature" || r=$?
     else
         estepn "\
 Vous allez créer la nouvelle feature branch ${COULEUR_VERTE}$feature${COULEUR_NORMALE}
@@ -138,7 +140,11 @@ Vous allez créer la nouvelle feature branch ${COULEUR_VERTE}$feature${COULEUR_N
 
         git_ensure_branch "$feature" "$source" "$origin"
         [ $? -eq 2 ] && die "Impossible de créer la branche $feature. Veuillez vérifier que la branche $source existe"
-        git checkout "$feature"
+        git checkout "$feature" || r=$?
+    fi
+    if [ "$r" -eq 0 ]; then
+        # éventuellement fast-forwarder automatiquement
+        git_fast_forward "$feature" "" "$origin"
     fi
 
     exit $?