From 3b62d77253ab33f550c39b0ac1c37598612f810d Mon Sep 17 00:00:00 2001
From: JoseluCross <jlgarrido97@gmail.com>
Date: Wed, 29 Jun 2016 19:51:54 +0200
Subject: [PATCH] Improved update option and include init option

---
 jka-toolkit/gitdit | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/jka-toolkit/gitdit b/jka-toolkit/gitdit
index 5a4c54a..1b80a97 100755
--- a/jka-toolkit/gitdit
+++ b/jka-toolkit/gitdit
@@ -2,30 +2,20 @@
 # gitdit, a dialog interface to manage git repositories 
 # Author: JKA Network - contacto@jkanetwork.com
 
-VERSION="0.2.2"
+VERSION="0.2.3"
 #First check if the user is in a git repository
 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 git (Hacer 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)"`
 	actual="origin $(git branch --list | grep "^*" | cut -f2 -d" ")" #Current branch
 fi
 if [ ! -z $gitopt ];then #No canceled
 	case $gitopt in
-		"p")	
-			git pull $actual;;
-		"s")	
-			estado=$(git status | wc -l) #It need to commit something?
-			if [ $estado -ne 2 ];then #When is necesary commit
-				commit=`dialog --stdout --inputbox  "Cambios (texto commit)" 10 50 "changes"`
-				if [[ -z $commit ]];then
-					commit="changes"
-				fi
-				git add . && git commit -m "$commit" && git push $actual
-			else #Nothing to commit, only push
-				git push $actual
-			fi
+		#Not staying in a git repo
+		"i")
+			git init
 			;;
 		"c")
 			giturl=`dialog --stdout --inputbox  "URL del git" 10 60`
@@ -35,6 +25,21 @@ if [ ! -z $gitopt ];then #No canceled
 			fi
 			git clone $giturl
 			;;
+		#Staying in a git repo
+		"p")	
+			git pull $actual;;
+		"s")	
+			estado=$(git status | grep "^Changes" ) #It need to commit something?
+			if [ $estado ];then #When is necesary commit
+				commit=`dialog --stdout --inputbox  "Cambios (texto commit)" 10 50 "changes"`
+				if [[ -z $commit ]];then
+					commit="changes"
+				fi
+				git add . && git commit -m "$commit" && git push $actual
+			else #Nothing to commit, only push
+				git push $actual
+			fi
+			;;
 		"t")
 			commit=`dialog --stdout --inputbox  "Cambios (texto commit)" 10 50 "changes"`
 			if [[ -z $commit ]];then
@@ -45,11 +50,12 @@ if [ ! -z $gitopt ];then #No canceled
 		"b")
 			j=0
 			rama=""
+			#Loop to create dialog whith all branches (except the current)
 			for i in $(git branch --list | grep "^*" -v )
 			do
 				if [ $i != "*" ];then
 					rama="$rama $j $i"
-					lista[$j]=$i
+					lista[$j]=$i #Array with the names of branches
 					let j++
 				fi		
 			done