fix grestorestaged

Author: Bhavi Dhingra

cmd/gadd

@@ -13,7 +13,7 @@ source "$__CUSTOM_CONSOLE_UTIL"/__split_str
 
 function main() {
 
-    numUnstagedFiles=$(git status --short | grep "^.[A-Z?] " -c)
+    local numUnstagedFiles=$(git status --short | grep "^.[A-Z?] " -c)
     if [[ $numUnstagedFiles -eq 0 ]]; then
         gstatus
         echo

cmd/grestorestaged

@@ -12,7 +12,7 @@ source "$__CUSTOM_CONSOLE_UTIL"/__split_str
 
 function main() {
 
-    numStagedFiles=$(git status --short | grep "^[A-Z] " -c)
+    local numStagedFiles=$(git status --short | grep "^[A-Z]" -c)
     if [[ $numStagedFiles -eq 0 ]]; then
         gstatus
         echo
@@ -23,10 +23,10 @@ function main() {
     __intend_to_add_untracked_files
 
     if [[ $# -gt 0 ]]; then
-        git status --short | grep "^[A-Z] " | read_and_restore_staged_files
+        git status --short | grep "^[A-Z]" | read_and_restore_staged_files
     else
         local GRESTORESTAGED_HEADER="$(__grestorestaged_header)"
-        git status --short | grep "^[A-Z] " |\
+        git status --short | grep "^[A-Z]" |\
             fzf -m --color 'fg:64'\
                 --bind 'q:abort'\
                 --bind '?:toggle-preview'\
@@ -45,16 +45,16 @@ function read_and_restore_staged_files() {
     while read -r str; do
 
         if [[ ${str:0:1} != "R" ]]; then
-            local file="${str#"${str:0:3}"}"
+            local file="${str#"${str:0:3}"}"    # remove first 3 characters
             restore_staged_file "${file}"
             continue
         fi
 
+        str="${str#"${str:0:3}"}"               # remove first 3 characters
         __split_str "${str}" " -> "
         local oldFile="${RESULT_ARR[0]}"
         local newFile="${RESULT_ARR[1]}"
 
-        oldFile="${oldFile#"R  "}"
         restore_staged_file "${oldFile}"
         restore_staged_file "${newFile}"
     done
@@ -75,4 +75,4 @@ if [[ $# -eq 1 && "$*" == "." ]]; then
     exit 0
 fi
 
-__print_err "valid input to grestorestaged: \".\""
+__print_err "valid input to grestorestaged: \".\""

custom-console-bash

@@ -6,6 +6,7 @@ source "$__CUSTOM_CONSOLE_UTIL"/__trim_double_quotes
 
 function __intend_to_add_untracked_files() {
 
+	local untrackedFile=""
 	git status --short | grep "^[?]" | while read -r untrackedFile; do
 		untrackedFile=${untrackedFile#"?? "}
 		untrackedFile="$(__trim_double_quotes "${untrackedFile}")"