From a99b597217028c107e6785c099b73153e1c033db Mon Sep 17 00:00:00 2001
From: John D Pell <John+git@gaelicWizard.net>
Date: Thu, 12 Aug 2021 22:00:52 -0700
Subject: [PATCH 1/2] plugin/git-subrepo: use `$HOME` instead of `~`

If the outer variable is double-quoted, then the default expansion when undefined does not get tilde-expanded. Use `$HOME`.
---
 plugins/available/git-subrepo.plugin.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/available/git-subrepo.plugin.bash b/plugins/available/git-subrepo.plugin.bash
index 085a69b4..59e780ac 100644
--- a/plugins/available/git-subrepo.plugin.bash
+++ b/plugins/available/git-subrepo.plugin.bash
@@ -3,4 +3,4 @@
 cite about-plugin
 about-plugin 'load git-subrepo if you are using it, and initialize completions'
 
-[[ -e "${GIT_SUBREPO_ROOT:=~/.git-subrepo}/init" ]] && source "$GIT_SUBREPO_ROOT/init"
+[[ -e "${GIT_SUBREPO_ROOT:=$HOME/.git-subrepo}/init" ]] && source "$GIT_SUBREPO_ROOT/init"

From c030f2108bc620f1c102238dfdb10a5f2348df64 Mon Sep 17 00:00:00 2001
From: John D Pell <John+git@gaelicWizard.net>
Date: Sat, 1 Jan 2022 22:44:44 -0800
Subject: [PATCH 2/2] plugin/git-subrepo: `shellcheck`

---
 clean_files.txt                           | 1 +
 plugins/available/git-subrepo.plugin.bash | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/clean_files.txt b/clean_files.txt
index 8c8b3fed..c03558f2 100644
--- a/clean_files.txt
+++ b/clean_files.txt
@@ -89,6 +89,7 @@ plugins/available/blesh.plugin.bash
 plugins/available/cmd-returned-notify.plugin.bash
 plugins/available/direnv.plugin.bash
 plugins/available/docker-machine.plugin.bash
+plugins/available/git-subrepo.plugin.bash
 plugins/available/git.plugin.bash
 plugins/available/go.plugin.bash
 plugins/available/goenv.plugin.bash
diff --git a/plugins/available/git-subrepo.plugin.bash b/plugins/available/git-subrepo.plugin.bash
index 59e780ac..6eb8d7c4 100644
--- a/plugins/available/git-subrepo.plugin.bash
+++ b/plugins/available/git-subrepo.plugin.bash
@@ -1,6 +1,7 @@
-# Load git-subrepo if you are using it, and initialize completions
-
-cite about-plugin
+# shellcheck shell=bash
 about-plugin 'load git-subrepo if you are using it, and initialize completions'
 
-[[ -e "${GIT_SUBREPO_ROOT:=$HOME/.git-subrepo}/init" ]] && source "$GIT_SUBREPO_ROOT/init"
+if [[ -s "${GIT_SUBREPO_ROOT:=$HOME/.git-subrepo}/init" ]]; then
+	# shellcheck disable=SC1091
+	source "$GIT_SUBREPO_ROOT/init"
+fi