Resolved conflict

10 years ago · c279c77fd8
parent 5cbd877fe5
commit c279c77fd8
1 changed files with 2 additions and 1 deletions
--- a/gitstatus.sh
+++ b/gitstatus.sh
@ -40,7 +40,8 @@ if [[ "$__GIT_PROMPT_IGNORE_STASH" = "1" ]]; then
 else
  stash_file="$( git rev-parse --git-dir )/logs/refs/stash"
  if [[ -e "${stash_file}" ]]; then
-    num_stashed=$( wc -l < "${stash_file}" | tr -s ' ' | cut -d ' ' -f2 )
+    wc_output=$( wc -l < "${stash_file}" )
    num_stashed=${wc_output// /}
  else
    num_stashed=0
  fi