X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/dad32b0f91c8e2cf9986ea1eb3f869e4774a963e..de1c75a12e9f0f586b1973d3866ad4707d263a08:/vcsh

diff --git a/vcsh b/vcsh
index 15eec51..a374f05 100755
--- a/vcsh
+++ b/vcsh
@@ -285,13 +285,42 @@ retire() {
 }
 
 list_untracked() {
+	command -v 'comm' >/dev/null 2>&1 || fatal "Could not find 'comm'"
+
+	temp_file_others=$(mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX") || fatal 'Could not create temp file'
+	temp_file_untracked=$(mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX") || fatal 'Could not create temp file'
+	temp_file_untracked_copy=$(mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX") || fatal 'Could not create temp file'
+
+	# Hack in support for `vcsh list-untracked -r`
+	directory_opt="--directory"
+	shift 1
+	while getopts "r" flag; do
+		if [ x"$1" = x'-r' ]; then
+			unset directory_opt
+		fi
+		shift 1
+	done
+
 	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"
-		files_other="$(git ls-files --others)"
-		[ -z $ran_once ] && { ran_once=1; files_untracked=$files_other; }
+		git ls-files --others "$directory_opt" | (
+			while read line; do
+				echo "$line"
+				directory_component="$(echo "$line" | cut -d'/' -f1)"
+				[ -d "$directory_component" ] && printf '%s/\n' "$directory_component"
+			done
+			) | sort -u > $temp_file_others
+		if [ -z "$ran_once" ]; then
+			ran_once=1
+			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
 	done
-	echo "$files_untracked" | sort -u
+	cat $temp_file_untracked
+
+	unset directory_opt directory_component
+	rm -f $temp_file_others $temp_file_untracked $temp_file_untracked_copy || fatal 'Could not delete temp files'
 }
 
 rename() {