X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/35b17e1f898e59c8e6bc25798b274881eaf98d06..0ea8735cfa3033e4b974bd1f9d4bbf8a7d74e8ca:/vcsh?ds=inline

diff --git a/vcsh b/vcsh
index 7004cdf..cebd798 100755
--- a/vcsh
+++ b/vcsh
@@ -284,19 +284,44 @@ retire() {
 	unset VCSH_DIRECTORY
 }
 
+command_exists() {
+	command -v "$1" >/dev/null 2>&1 || fatal "Could not find '$1' command"
+}
+
 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"
+	)
+	
+	export GIT_DIR=$temp_repo/.git
+	git ls-files --others --directory | sort -u > $temp_file_untracked
+	
 	for VCSH_REPO_NAME in $(list); do
-		[ -n $ran_once ] && foo="$(comm -12 --nocheck-order $temp_file_others $temp_file_untracked)"
-		echo "$foo" > $temp_file_untracked
-#		[ -n $ran_once ] && files_untracked=$(printf '%s\n' "$files_untracked" | grep -Fx "$files_other")
 		export GIT_DIR="$VCSH_REPO_D/$VCSH_REPO_NAME.git"
-		git ls-files --others | sort -u > $temp_file_others
-		[ -z "$ran_once" ] && { ran_once=1; cp $temp_file_others $temp_file_untracked; }
+		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
 	cat $temp_file_untracked
-	rm $temp_file_others $temp_file_untracked || fatal 'Could not delete temp file'
+	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() {