X-Git-Url: https://git.madduck.net/code/vcsh.git/blobdiff_plain/f7ce400c37d3308122195fd70fa79dff7aac00e3..53311ba2f69d55b2148866c40148dbbfaee8c761:/vcsh?ds=sidebyside

diff --git a/vcsh b/vcsh
index b675edd..e8513ed 100755
--- a/vcsh
+++ b/vcsh
@@ -161,7 +161,7 @@ clone() {
 	done
 	[ x"$VCSH_CONFLICT" = x'1' ]) &&
 		fatal "will stop after fetching and not try to merge!
-  Once this situation has been resolved, run 'vcsh run $VCSH_REPO_NAME git pull' to finish cloning." 17
+  Once this situation has been resolved, run 'vcsh $VCSH_REPO_NAME pull' to finish cloning." 17
 	git merge origin/master
 	hook post-merge
 	hook post-clone
@@ -244,12 +244,14 @@ get_files() {
 list_tracked() {
 	for VCSH_REPO_NAME in $(list); do
 		get_files
-	done | sort -u
+	done | sed "s,^,$(printf '%s\n' "$VCSH_BASE/" | \
+	    sed 's/[,\&]/\\&/g')," | sort -u
 }
 
 list_tracked_by() {
 	use
-	git ls-files | sort -u
+	git ls-files | sed "s,^,$(printf '%s\n' "$VCSH_BASE/" | \
+	    sed 's/[,\&]/\\&/g')," | sort -u
 }
 
 pull() {