From: Richard Hartmann <richih@debian.org>
Date: Mon, 18 May 2015 07:19:58 +0000 (+0200)
Subject: vcsh: Prepare status() for vcsh longopts
X-Git-Url: https://git.madduck.net/code/vcsh.git/commitdiff_plain/6c3fa632c62fc3e381ba8404692d24cfad290ad7?ds=sidebyside;hp=620f88afcf0806fe5e522887f224ac608b28ffd8

vcsh: Prepare status() for vcsh longopts
---

diff --git a/vcsh b/vcsh
index 2f50261..a630f97 100755
--- a/vcsh
+++ b/vcsh
@@ -377,7 +377,7 @@ status() {
 		for VCSH_REPO_NAME in $(list); do
 			STATUS=$(status_helper $VCSH_REPO_NAME "$COLORING")
 			[ -n "$STATUS" -o -z "$VCSH_STATUS_TERSE" ] && echo "$VCSH_REPO_NAME:"
-			[ -n "$STATUS" ] && echo "$STATUS"
+			[ -n "$STATUS" ]            && echo "$STATUS"
 			[ -z "$VCSH_STATUS_TERSE" ] && echo
 		done
 	fi
@@ -385,6 +385,7 @@ status() {
 
 status_helper() {
 	GIT_DIR=$VCSH_REPO_D/$1.git; export GIT_DIR
+	VCSH_GIT_OPTIONS=$2
 	use
 	remote_tracking_branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2> /dev/null) && {
 		commits_behind=$(git log ..${remote_tracking_branch} --oneline | wc -l)
@@ -392,7 +393,7 @@ status_helper() {
 		[ ${commits_behind} -ne 0 ] && echo "Behind $remote_tracking_branch by $commits_behind commits"
 		[ ${commits_ahead} -ne 0 ] && echo "Ahead of $remote_tracking_branch by $commits_ahead commits"
 	}
-	git $2 status --short --untracked-files='no'
+	git ${VCSH_GIT_OPTIONS} status --short --untracked-files='no'
 	VCSH_COMMAND_RETURN_CODE=$?
 }
 
@@ -560,8 +561,7 @@ elif [ x"$VCSH_COMMAND" = x'commit' ] ||
 	:
 elif [ x"$VCSH_COMMAND" = x'status' ]; then
 	if [ x"$2" = x'--terse' ]; then
-		VCSH_STATUS_TERSE=1
-		export VCSH_STATUS_TERSE
+		VCSH_STATUS_TERSE=1; export VCSH_STATUS_TERSE
 		shift
 	fi
 	VCSH_REPO_NAME=$2; export VCSH_REPO_NAME