From fd786666526edc8ad41e0e996018f567e2c23dc9 Mon Sep 17 00:00:00 2001
From: JoseluCross <jlgarrido97@gmail.com>
Date: Thu, 30 Jun 2016 16:16:04 +0200
Subject: [PATCH] add option, update before change branch

---
 jka-toolkit/gitdit | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/jka-toolkit/gitdit b/jka-toolkit/gitdit
index 3b06665..3ac39b9 100755
--- a/jka-toolkit/gitdit
+++ b/jka-toolkit/gitdit
@@ -8,7 +8,7 @@ preOption=$(git status 2>/dev/stdout | sed -n 1p | cut -f2 -d" ")
 if [ $preOption = "Not" ];then #When it isn't only it can do git clone
 	gitopt=`dialog --stdout --scrollbar --menu "gitdit - Git DIalog inTerface" 0 0 6 c "Descargar un nuevo repo (Hacer clone)" i "Inicializar nuevo repo"`
 else #Else, all other options
-	gitopt=`dialog --stdout --scrollbar --menu "gitdit - Git DIalog inTerface" 0 0 6 p "Descargar actualizaciones del git (Hacer pull)" t "Confirmar cambios sin subida" s "Subir actualizaciones al git (Hacer push)" n "Crear nueva rama" b "Cambiar de branch/rama (Hacer checkout)" m "Unir ramas (Hacer merge)"`
+	gitopt=`dialog --stdout --scrollbar --menu "gitdit - Git DIalog inTerface" 0 0 6 p "Descargar actualizaciones del git (Hacer pull)" t "Confirmar cambios sin subida" s "Subir actualizaciones al git (Hacer push)" n "Crear nueva rama" b "Cambiar de rama " u "Cambiar de rama y actualizar" m "Unir ramas (Hacer merge)"`
 	actual="origin $(git branch --list | grep "^*" | cut -f2 -d" ")" #Current branch
 	actual2=$(git branch --list | grep "^*" | cut -f2 -d" ") #Current branch name
 fi
@@ -65,7 +65,7 @@ if [ ! -z $gitopt ];then #No canceled
 			fi
 			git add . && git commit -m "$commit"
 			;;
-		"b")
+		"b" | "u")
 			j=0
 			rama=""
 			#Loop to create dialog whith all branches (except the current)
@@ -80,7 +80,7 @@ if [ ! -z $gitopt ];then #No canceled
 					error=0 #If 1 aux is yet in lista array
 					for (( i=0;i<${#lista[@]} && error==0;i++ )) 
 					do
-						if [ $aux = ${lista[$i]} -o $aux = $actual2 ];then
+						if [ $aux =s ${lista[$i]} -o $aux = $actual2 ];then
 							error=1
 						fi
 					done
@@ -97,6 +97,9 @@ if [ ! -z $gitopt ];then #No canceled
 			ramificacion=`dialog --stdout --scrollbar --menu "Selecione la rama a saltar" 0 0 6 $rama`
 			if [ ! -z $ramificacion ];then
 				git checkout ${lista[$ramificacion]}
+				if [ $gitopt = "u" ];then
+					git pull origin ${lista[$ramificacion]}
+				fi
 			fi
 			;;
 		"n")