vcsh: Fix regression introduced in d946b07817ffe6e

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 2f5026199476026554e6a44bca551d36551863b1..ff256dad67e4ea03a313743853bcfab8c04f0832 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # This program is licensed under the GNU GPL version 2 or later.
-# (c) Richard "RichiH" Hartmann <richih@debian.org>, 2011-2014
+# (c) Richard "RichiH" Hartmann <richih@debian.org>, 2011-2015
 # For details, see LICENSE. To submit patches, you have to agree to
 # license your code under the GNU GPL version 2 or later.
 
@@ -313,7 +313,7 @@ list_untracked_helper() {
                cp $temp_file_others $temp_file_untracked || fatal 'Could not copy temp file'
        fi
        cp $temp_file_untracked $temp_file_untracked_copy || fatal 'Could not copy temp file'
-       comm -12 --nocheck-order $temp_file_others $temp_file_untracked_copy > $temp_file_untracked
+       comm -12 $temp_file_others $temp_file_untracked_copy > $temp_file_untracked
 }
 
 pull() {
@@ -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=$?
 }
 
@@ -424,12 +425,16 @@ use() {
 }
 
 which() {
-       [ -e "$VCSH_COMMAND_PARAMETER" ] || fatal "'$VCSH_COMMAND_PARAMETER' does not exist" 1
-       for VCSH_REPO_NAME in $(list); do
+       output=$(for VCSH_REPO_NAME in $(list); do
                for VCSH_FILE in $(get_files); do
                        echo "$VCSH_FILE" | grep -q "$VCSH_COMMAND_PARAMETER" && echo "$VCSH_REPO_NAME: $VCSH_FILE"
                done
-       done | sort -u
+       done | sort -u)
+       if [ -z "$output" ]; then
+               fatal "'$VCSH_COMMAND_PARAMETER' does not exist" 1
+       else
+               echo "$output"
+       fi
 }
 
 write_gitignore() {
@@ -560,8 +565,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