Fix git subrepo status command for subrepos that share a common prefix.

Closes ingydotnet#534.
mahmoudimus · Mar 16, 2022 · a36db4c · a36db4c
1 parent b7c0a1c
commit a36db4c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/git-subrepo b/lib/git-subrepo
@@ -959,7 +959,7 @@ subrepo:status() {
     local _worktree
     _worktree=$(
       git worktree list |
-        grep "$GIT_TMP/subrepo/$subdir"
+        grep "$GIT_TMP/subrepo/$subdir "
     ) || true
     if [[ $_worktree  ]]; then
       echo "  Worktree: $_worktree"
@@ -1568,7 +1568,7 @@ get-all-subrepos() {
 add-subrepo() {
   if ! $ALL_wanted; then
     for path in "${subrepos[@]}"; do
-      [[ $1 =~ ^$path ]] && return
+      [[ $1 =~ ^$path/ ]] && return
     done
   fi
   subrepos+=("$1")