Don't use subshell when creating the temporary repo

[code/vcsh.git] / vcsh

diff --git a/vcsh b/vcsh
index 15eec5153d1e27caea5343a4ce6797c7da4fd6e8..279de43c2118baeb669c1bbeffcc2c16734625ee 100755 (executable)
--- a/vcsh
+++ b/vcsh
@@ -284,14 +284,44 @@ 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'
+
+       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
+       

        for VCSH_REPO_NAME in $(list); do
        for VCSH_REPO_NAME in $(list); do

-               [ -n $ran_once ] && files_untracked=$(printf '%s\n' "$files_untracked" | grep -Fx "$files_other")

                export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
                export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"

-               files_other="$(git ls-files --others)"
-               [ -z $ran_once ] && { ran_once=1; files_untracked=$files_other; }
+               git ls-files --others --directory | (
+                       while read line; do
+                               echo "$line"
+                               printf '%s/\n' "$(echo "$line" | cut -d'/' -f1)"
+                       done
+                       ) | sort -u > $temp_file_others
+               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

        done
        done

-       echo "$files_untracked" | sort -u
+       cat $temp_file_untracked
+       rm -f $temp_file_others $temp_file_untracked $temp_file_untracked_copy || fatal 'Could not delete temp files'
+       rm -rf $temp_repo || fatal 'Could not delete temp repo'

 }
 
 rename() {
 }
 
 rename() {