Don't use subshell when creating the temporary repo

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 8e765c41a6edda6a92be12d1b75d1327fe3f2a52..279de43c2118baeb669c1bbeffcc2c16734625ee 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -284,20 +284,26 @@ retire() {
        unset VCSH_DIRECTORY
 }
 
        unset VCSH_DIRECTORY
 }
 

+command_exists() {
+       command -v "$1" >/dev/null 2>&1 || fatal "Could not find '$1' command"
+}
+

 list_untracked() {
 list_untracked() {

+       command_exists comm
+

        temp_file_others=$(mktemp) || fatal 'Could not create temp file'
        temp_file_untracked=$(mktemp) || fatal 'Could not create temp file'
        temp_file_untracked_copy=$(mktemp) || fatal 'Could not create temp file'
        
        # create dummy git repo
        temp_repo=$(mktemp -d) || fatal 'Could not create temp repo'
        temp_file_others=$(mktemp) || fatal 'Could not create temp file'
        temp_file_untracked=$(mktemp) || fatal 'Could not create temp file'
        temp_file_untracked_copy=$(mktemp) || fatal 'Could not create temp file'
        
        # create dummy git repo
        temp_repo=$(mktemp -d) || fatal 'Could not create temp repo'

-       (
+

        cd $temp_repo || fatal 'Could not cd into temp repo'
        git init -q
        mktemp -q -p $(pwd) > /dev/null || fatal 'Could not create dummy file'
        git add .
        git commit -q -m "dummy"
        cd $temp_repo || fatal 'Could not cd into temp repo'
        git init -q
        mktemp -q -p $(pwd) > /dev/null || fatal 'Could not create dummy file'
        git add .
        git commit -q -m "dummy"

-       )
+       cd - > /dev/null 2>&1 || fatal 'Could not cd back'

        
        export GIT_DIR=$temp_repo/.git
        git ls-files --others --directory | sort -u > $temp_file_untracked
        
        export GIT_DIR=$temp_repo/.git
        git ls-files --others --directory | sort -u > $temp_file_untracked