diff --git a/.fish.rc b/.fish.rc
new file mode 100644
index 00000000..ad8f7f11
--- /dev/null
+++ b/.fish.rc
@@ -0,0 +1,18 @@
+#------------------------------------------------------------------------------
+#
+# This is the `git-subrepo` initialization script.
+#
+# This script turns on the `git-subrepo` Git subcommand and its manpages, for
+# the *Fish* shell.
+#
+# Just add a line like this to your `~/.config/fish/config.fish`:
+#
+#   source /path/to/git-subrepo/.fish.rc
+#
+#------------------------------------------------------------------------------
+
+set GIT_SUBREPO_ROOT (dirname (realpath (status --current-filename)))
+set PATH $GIT_SUBREPO_ROOT/lib $PATH
+
+set -q MANPATH || set MANPATH ''
+set MANPATH $MANPATH $GIT_SUBREPO_ROOT/man
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
new file mode 100644
index 00000000..330ed25c
--- /dev/null
+++ b/.github/workflows/pre-commit.yml
@@ -0,0 +1,16 @@
+name: pre-commit
+
+on:
+  pull_request:
+  push:
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          # For PRs from forks, checkout the merge commit to avoid branch name conflicts
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
+      - uses: actions/setup-python@v3
+      - uses: pre-commit/action@v3.0.1
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 00000000..2fc2950c
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,44 @@
+name: Test
+
+on:
+  push:
+    branches: ["*"]
+  pull_request:
+    branches: ["*"]
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          repository: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
+          ref: ${{ github.event.pull_request.head.ref || github.ref_name }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Ensure we're on a proper branch
+        run: |
+          if [ "${{ github.event_name }}" = "pull_request" ]; then
+            # For PRs, create a local branch from the HEAD
+            git checkout -b "pr-${{ github.event.pull_request.number }}-${{ github.event.pull_request.head.ref }}"
+          elif git symbolic-ref -q HEAD >/dev/null; then
+            # Already on a branch, nothing to do
+            echo "Already on branch $(git branch --show-current)"
+          else
+            # Detached HEAD, create a branch
+            git checkout -b "workflow-$(date +%s)"
+          fi
+      - if: startsWith(matrix.os, 'macos')
+        run: brew install bash
+      - run: git config --global user.email "you@example.com";
+          git config --global user.name "Your Name";
+          git config --global init.defaultBranch "master";
+          git config --global --add safe.directory "$PWD";
+          git config --global --add safe.directory "$PWD.git";
+      - if: startsWith(matrix.os, 'macos')
+        run: make test
+      - if: startsWith(matrix.os, 'ubuntu')
+        run: make CI_TEST
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..eabf2e00
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/test/tmp/
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 00000000..f08ca164
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,21 @@
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+    -   id: check-yaml
+    -   id: end-of-file-fixer
+    -   id: check-illegal-windows-names
+    -   id: check-merge-conflict
+    -   id: trailing-whitespace
+    -   id: check-executables-have-shebangs
+    -   id: check-shebang-scripts-are-executable
+        exclude: \.t$
+-   repo: https://github.com/koalaman/shellcheck-precommit
+    rev: v0.10.0
+    hooks:
+    -   id: shellcheck
+        args: [-x]
+        exclude: |
+             (?x)^(ext/.*|
+                 share/git-completion.bash
+             )$
diff --git a/.rc b/.rc
index 246f7bc4..6525c601 100644
--- a/.rc
+++ b/.rc
@@ -1,4 +1,4 @@
-#!bash
+# shellcheck shell=bash disable=2128
 
 #------------------------------------------------------------------------------
 #
@@ -16,10 +16,17 @@
 [[ -n ${ZSH_VERSION-} ]] &&
   GIT_SUBREPO_ROOT=$0 ||
   GIT_SUBREPO_ROOT=$BASH_SOURCE
+
 [[ $GIT_SUBREPO_ROOT =~ ^/ ]] ||
   GIT_SUBREPO_ROOT=$PWD/$GIT_SUBREPO_ROOT
-export GIT_SUBREPO_ROOT=$(cd "$(dirname "$GIT_SUBREPO_ROOT")"; pwd)
+
+GIT_SUBREPO_ROOT=$(
+  cd "$(dirname "$GIT_SUBREPO_ROOT")" || return
+  pwd
+) || return
+export GIT_SUBREPO_ROOT
 
 export PATH=$GIT_SUBREPO_ROOT/lib:$PATH
 export MANPATH=$GIT_SUBREPO_ROOT/man:$MANPATH
+
 source "$GIT_SUBREPO_ROOT/share/enable-completion.sh"
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index a590c5a3..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-dist: trusty
-sudo: false
-
-# Want 'bash' but 'c' works:
-language: c
-
-branches:
-  only:
-  - master
-  - /^release\//
-
-script:
-- git checkout $(
-    git branch --contains HEAD
-        | cut -c3-
-        | grep -E '^(master$|release)'
-        | head -1
-  )
-- GIT_COMMITTER_NAME=Bob
-  GIT_COMMITTER_EMAIL=bob@blob.net
-  GIT_AUTHOR_NAME='Bob Blob'
-  GIT_AUTHOR_EMAIL=bob@blob.net
-  PROVEOPT=-v make test
diff --git a/Changes b/Changes
index aee5e7c1..f0b981c9 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,92 @@
+version: 0.4.9
+date:    Mon 25 Jul 2024 11:23:34 AM CST
+- Revert Fix bash-completion due to not being compatible with Windows
+---
+version: 0.4.8
+date:    Mon 22 Jul 2024 07:40:00 AM CST
+- Remove all subrepo refs with clean --force
+- Allow the error() function to accept multiple arguments
+- Bug fixed where clone --force could change the tracked branch
+- Give a detailed error message if the parent SHA could not be found
+- Use the git configuration to determine the default branch name for the init command
+- Add --force to fetch command
+- Fix executable settings on installed files
+- Remove shebangs from library only files
+- Fix bash-completion for instances that used make install
+---
+version: 0.4.7
+date:    Sun 7 Jul 2024 11:04:00 AM EST
+- Convert testing to use docker with updated git versions
+- Fix numerous places where quoting was incorrect causing path name collisions
+- Fix pull-force test to deal with git not defaulting to merges on pulls after 2.33
+- Fix issue where docker tests didn't work with git 2.30 or higher because of
+  increased permission scrutiny.
+- Update readme to say this tools is in production environments
+- Update readme to use internet archive for old articles about subrepo no longer
+  available on their original source
+---
+version: 0.4.6
+date:    Fri 21 Apr 2023 10:18:34 AM EST
+- Remove stale worktrees in the push command
+---
+version: 0.4.5
+date:    Thu 22 Sep 2022 23:03:24 PM EST
+- Add --file option
+- Fix git subrepo status command for subrepos that share a common prefix. Closes #534.
+- Don't allow -b and --all
+- Fix documentation links
+- fix tests to support use of a default branch git config that is not "master"
+- pass --force to git add so a user's global .gitignore does not affect tests
+- Fix .rc and enable-completion.sh for zsh before 5.1
+- Better format for options
+- The `fpath` variable is an array; expand correctly
+---
+version: 0.4.3
+date:    Sat 21 Nov 2020 03:28:43 PM EST
+- Apply PR#511 to fix a 0.4.2 regression in zsh
+---
+version: 0.4.2
+date:    Tue Nov 17 14:10:10 CST 2020
+- Covert to GitHub Actions for testing
+- Add docker support to test multiple git/bash versions together
+- Require Bash 4.0+
+- Use shellcheck as linter and address issues discovered
+- Discovered bug in git where @ is not a valid workspace name
+- Add --force command to subrepo pull
+- Now works with paths that contain spaces
+- Numerous documentation fixes
+- When two branches pointed to the same commit, we would
+  sometimes pick the wrong branch.
+- ZSH completion fixes
+- Allow tests to run outside a git repo
+- Would not work if a different date format was set in git config
+- Address delay in filter-branch on newer versions of git
+- Display the git merge message on merge failure
+- Allow FISH integration on MacOS.
+- Add manpage support for FISH shell
+---
+version: 0.4.1
+date:    Thu Jan  9 17:11:21 CST 2020
+- Fix Bash version error messages and add to .rc
+- Nicer YAML formatting in .travis.yml
+- Wrap a long line
+- Update the docs
+- Force `make update` to always update docs
+- Don't use XXX in perl stuff
+- Add testing on MacOS
+- Remove conflicting -C from install -d commands.
+- Update version requirement documentation
+- Correct error message in branch
+- Use topo-order in subrepo branch
+- Make “git subrepo clean -f ...” delete refs correctly
+- Fix #410 Push empty repositories with recent git versions
+- Make subrepo work when run in a worktree
+- Simplify finding subrepos
+- Ask git to find the .gitrepo files
+- Doc: fix sentence repetition
+- Fix typos
+- Fixed typo
+- Travis CI not checking out a branch.
 ---
 version: 0.4.0
 date:    Thu Nov  8 12:26:38 CET 2018
diff --git a/Intro.pod b/Intro.pod
index b7316fec..656c5f32 100644
--- a/Intro.pod
+++ b/Intro.pod
@@ -1,7 +1,7 @@
 =pod
 
 =for comment
-DO NOT EDIT. This Pod was generated by Swim v0.1.41.
+DO NOT EDIT. This Pod was generated by Swim v0.1.48.
 See http://github.com/ingydotnet/swim-pm#readme
 
 =encoding utf8
@@ -78,7 +78,7 @@ Submodules tend to receive a lot of bad press. Here's some of it:
 
 =item * L<http://ayende.com/blog/4746/the-problem-with-git-submodules>
 
-=item * L<http://somethingsinistral.net/blog/git-submodules-are-probably-not-the-answer/>
+=item * L<https://web.archive.org/web/20171101202911/http://somethingsinistral.net/blog/git-submodules-are-probably-not-the-answer/>
 
 =item * L<http://codingkilledthecat.wordpress.com/2012/04/28/why-your-company-shouldnt-use-git-submodules/>
 
@@ -307,12 +307,10 @@ Good:
 
 =item * Bash code is very simple and easy to follow.
 
-=item * Comprehensive test suite. Currently passing on travis:
+=item * Comprehensive test suite.
 
 =back
 
-<badge travis ingydotnet/git-subrepo>
-
 Bad:
 
 =over
@@ -426,10 +424,10 @@ The resulting history is:
 
 Compare that to B<subtree>. This:
 
-    $ git subrepo add abc git@github.com:user/abc master
-    $ git subrepo add xyz git@github.com:user/def master
-    $ git subrepo pull abc git@github.com:user/abc master
-    $ git subrepo pull xyz git@github.com:user/def master
+    $ git subtree add abc git@github.com:user/abc master
+    $ git subtree add xyz git@github.com:user/def master
+    $ git subtree pull abc git@github.com:user/abc master
+    $ git subtree pull xyz git@github.com:user/def master
 
 Produces this:
 
diff --git a/License b/License
index ff754eb7..8cf5dea0 100644
--- a/License
+++ b/License
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2017 Ingy döt Net
+Copyright (c) 2013-2020 Ingy döt Net
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Makefile b/Makefile
index 764bd656..77a2b948 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,6 @@
-# Make sure we have 'git' and it works OK:
+SHELL := bash
+
+# Make sure we have git:
 ifeq ($(shell which git),)
   $(error 'git' is not installed on this system)
 endif
@@ -19,6 +21,22 @@ INSTALL_LIB  ?= $(DESTDIR)$(shell git --exec-path)
 INSTALL_EXT  ?= $(INSTALL_LIB)/$(NAME).d
 INSTALL_MAN1 ?= $(DESTDIR)$(PREFIX)/share/man/man1
 
+# Docker variables:
+DOCKER_TAG ?= admorgan/git-subrepo-testing:1.0
+DOCKER_IMAGE := $(DOCKER_TAG)
+BASH_VERSIONS ?= 5.3 5.2 5.1 5.0 4.4 4.3 4.2 4.1 4.0
+GIT_VERSIONS := 2.51 2.48 2.40 2.30 2.29 2.25 2.23
+
+# Create matrix of all bash/git combinations for comprehensive testing
+BASH_GIT_COMBINATIONS := $(foreach bash,$(BASH_VERSIONS),$(foreach git,$(GIT_VERSIONS),$(bash)-$(git)))
+DOCKER_TESTS := $(BASH_GIT_COMBINATIONS:%=docker-test-%)
+DOCKER_BASH_TESTS := $(BASH_VERSIONS:%=docker-bash-test-%)
+
+prove ?=
+test ?= test/
+bash ?= 5.3
+git ?= 2.51
+
 # Basic targets:
 default: help
 
@@ -29,18 +47,60 @@ help:
 	@echo 'install    Install $(NAME)'
 	@echo 'uninstall  Uninstall $(NAME)'
 	@echo 'env        Show environment variables to set'
+	@echo ''
+	@echo 'Docker testing:'
+	@echo 'docker-build      Build Docker image with multiple bash/git versions'
+	@echo 'docker-tests      Test ALL bash/git combinations (comprehensive)'
+	@echo 'docker-bash-tests Test all bash versions with default git (faster)'
+	@echo 'docker-test       Test specific bash/git: make docker-test bash=5.1 git=2.25'
+	@echo 'CI_TEST           Test oldest and newest bash/git combinations for CI'
+	@echo ''
+	@echo 'Available bash versions: $(BASH_VERSIONS)'
+	@echo 'Available git versions:  $(GIT_VERSIONS)'
+	@echo ''
 
 .PHONY: test
 test:
-	prove $(PROVEOPT:%=% )test/
+	prove $(prove) $(test)
+
+test-all: test docker-tests
+
+CI_TEST:
+	@echo "Running CI tests with oldest and newest bash/git combinations"
+	$(call docker-make-test,$(lastword $(BASH_VERSIONS)),$(lastword $(GIT_VERSIONS)))
+	$(call docker-make-test,$(firstword $(BASH_VERSIONS)),$(firstword $(GIT_VERSIONS)))
+
+docker-test:
+	$(call docker-make-test,$(bash),$(git))
+
+docker-build:
+	docker build -t $(DOCKER_TAG) test/
+
+# Test all bash/git combinations (comprehensive but slow)
+docker-tests: $(DOCKER_TESTS)
+
+# Test all bash versions with default git (faster option)
+docker-bash-tests: $(DOCKER_BASH_TESTS)
+
+
+
+# Parse bash-git combination from target name
+$(DOCKER_TESTS):
+	$(eval BASH_VER := $(shell echo "$(@:docker-test-%=%)" | cut -d'-' -f1))
+	$(eval GIT_VER := $(shell echo "$(@:docker-test-%=%)" | cut -d'-' -f2))
+	$(call docker-make-test,$(BASH_VER),$(GIT_VER))
+
+# Test specific bash version with default git
+$(DOCKER_BASH_TESTS):
+	$(call docker-make-test,$(@:docker-bash-test-%=%),$(git))
 
 # Install support:
 install:
-	install -C -d -m 0755 $(INSTALL_LIB)/
+	install -d -m 0755 $(INSTALL_LIB)/
 	install -C -m 0755 $(LIB) $(INSTALL_LIB)/
-	install -C -d -m 0755 $(INSTALL_EXT)/
-	install -C -m 0755 $(EXTS) $(INSTALL_EXT)/
-	install -C -d -m 0755 $(INSTALL_MAN1)/
+	install -d -m 0755 $(INSTALL_EXT)/
+	install -C -m 0644 $(EXTS) $(INSTALL_EXT)/
+	install -d -m 0755 $(INSTALL_MAN1)/
 	install -C -m 0644 $(MAN1)/$(NAME).1 $(INSTALL_MAN1)/
 
 # Uninstall support:
@@ -57,24 +117,45 @@ env:
 .PHONY: doc
 update: doc compgen
 
+force:
+
 doc: ReadMe.pod Intro.pod $(MAN1)/$(NAME).1
 	perl pkg/bin/generate-help-functions.pl $(DOC) > \
 	    $(EXT)/help-functions.bash
 
-ReadMe.pod: $(DOC)
+ReadMe.pod: $(DOC) force
 	swim --to=pod --wrap --complete $< > $@
 
-Intro.pod: doc/intro-to-subrepo.swim
+Intro.pod: doc/intro-to-subrepo.swim force
 	swim --to=pod --wrap --complete $< > $@
 
-$(MAN1)/%.1: doc/%.swim Makefile
+$(MAN1)/%.1: doc/%.swim Makefile force
 	swim --to=man --wrap $< > $@
 
-compgen:
+compgen: force
 	perl pkg/bin/generate-completion.pl bash $(DOC) $(LIB) > \
 	    $(SHARE)/completion.bash
 	perl pkg/bin/generate-completion.pl zsh $(DOC) $(LIB) > \
 	    $(SHARE)/zsh-completion/_git-subrepo
+	perl pkg/bin/generate-completion.pl fish $(DOC) $(LIB) > \
+	    $(SHARE)/git-subrepo.fish
+
+clean:
+	rm -fr tmp test/tmp
 
-clean purge:
-	rm -fr tmp
+define docker-make-test
+	docker run --rm \
+	    --user $(shell id -u):$(shell id -g) \
+	    -v $(PWD):/git-subrepo \
+	    -w /git-subrepo \
+	    $(DOCKER_IMAGE) \
+		/bin/bash -c ' \
+		    set -x && \
+		    [[ -d /bash-$(1) ]] && \
+		    [[ -d /git-$(2) ]] && \
+		    export PATH=/bash-$(1)/bin:/git-$(2)/bin:$$PATH && \
+		    bash --version && \
+		    git --version && \
+		    make test prove=$(prove) test=$(test) \
+		'
+endef
diff --git a/Meta b/Meta
index 56df85b0..8f5f2845 100644
--- a/Meta
+++ b/Meta
@@ -1,11 +1,11 @@
 =meta: 0.0.2
 
 name: git-subrepo
-version: 0.4.0
+version: 0.4.9
 abstract: Git Submodule Alternative
 homepage: https://github.com/ingydotnet/git-subrepo#readme
 license: MIT
-copyright: 2013-2018
+copyright: 2013-2024
 
 author:
   name: Ingy döt Net
@@ -16,8 +16,8 @@ author:
   homepage: http://ingy.net
 
 requires:
-  bash: 3.2.0
-  git: 1.7.0
+  bash: 4.0.0
+  git: 2.23.0
 test:
   cmd: make test
 install: make install
diff --git a/ReadMe.pod b/ReadMe.pod
index de035fa3..7f2e00c6 100644
--- a/ReadMe.pod
+++ b/ReadMe.pod
@@ -1,7 +1,7 @@
 =pod
 
 =for comment
-DO NOT EDIT. This Pod was generated by Swim v0.1.46.
+DO NOT EDIT. This Pod was generated by Swim v0.1.48.
 See http://github.com/ingydotnet/swim-pm#readme
 
 =encoding utf8
@@ -10,9 +10,6 @@ See http://github.com/ingydotnet/swim-pm#readme
 
 git-subrepo - Git Submodule Alternative
 
-=for html
-<a href="https://travis-ci.org/ingydotnet/git-subrepo"><img src="https://travis-ci.org/ingydotnet/git-subrepo.png" alt="git-subrepo"></a>
-
 =head1 Synopsis
 
     git subrepo -h    # Help Overview
@@ -117,7 +114,7 @@ The best short answer is:
 
 The complete "Installation Instructions" can be found below.
 
-Note: git-subrepo needs a git version (> 2.5) that supports worktree:s.
+Note: git-subrepo needs a git version >= 2.23) due to changes in --is-ansestor.
 
 =head1 Commands
 
@@ -131,7 +128,7 @@ all the same arguments. Keep reading…
 
 =over
 
-=item C<< git subrepo clone <repository> [<subdir>] [-b <branch>] [-f] [-m <msg>] [-e] [--method <merge|rebase>] >>
+=item C<< git subrepo clone <repository> [<subdir>] [-b <branch>] [-f] [-m <msg>] [--file=<msg file>] [-e] [--method <merge|rebase>] >>
 
 Add a repository as a subrepo in a subdir of your repository.
 
@@ -153,8 +150,8 @@ The C<--force> option will "reclone" (completely replace) an existing subdir.
 The C<--method> option will decide how the join process between branches are
 performed. The default option is merge.
 
-The C<clone> command accepts the C<--branch=> C<--edit>, C<--force> and C<--
-message=> options.
+The C<clone> command accepts the C<--branch=> C<--edit>, C<--file>, C<--force>
+and C<--message=> options.
 
 =item C<< git subrepo init <subdir> [-r <remote>] [-b <branch>] [--method <merge|rebase>] >>
 
@@ -163,15 +160,13 @@ Turn an existing subdirectory into a subrepo.
 If you want to expose a subdirectory of your project as a published subrepo,
 this command will do that. It will split out the content of a normal
 subdirectory into a branch and start tracking it as a subrepo. Afterwards your
-original repo will look exactly the same except that there will be a C<<
-<subdir>/.gitrepo >> file.
+original repo will look exactly the same except that there will be a C<<<subdir>/.gitrepo >> file.
 
 If you specify the C<--remote> (and optionally the C<--branch>) option, the
 values will be added to the C<< <subdir>/.gitrepo >> file. The C<--remote>
 option is the upstream URL, and the C<--branch> option is the upstream branch
 to push to. These values will be needed to do a C<git subrepo push> command,
-but they can be provided later on the C<push> command (and saved to C<<
-<subdir>/.gitrepo >> if you also specify the C<--update> option).
+but they can be provided later on the C<push> command (and saved to C<<<subdir>/.gitrepo >> if you also specify the C<--update> option).
 
 Note: You will need to create the empty upstream repo and push to it on your
       own, using C<< git subrepo push <subdir> >>.
@@ -181,7 +176,7 @@ performed. The default option is merge.
 
 The C<init> command accepts the C<--branch=> and C<--remote=> options.
 
-=item C<< git subrepo pull <subdir>|--all [-M|-R|-f] [-m <msg>] [-e] [-b <branch>] [-r <remote>] [-u] >>
+=item C<< git subrepo pull <subdir>|--all [-M|-R|-f] [-m <msg>] [--file=<msg file>] [-e] [-b <branch>] [-r <remote>] [-u] >>
 
 Update the subrepo subdir with the latest upstream changes.
 
@@ -218,10 +213,6 @@ When you pull you can assume a fast-forward strategy (default) or you can
 specify a C<--rebase>, C<--merge> or C<--force> strategy. The latter is the
 same as a C<clone --force> operation, using the current remote and branch.
 
-When you pull you can assume a fast-forward strategy (default) or you can
-specify a C<--rebase>, C<--merge> or C<--force> strategy. The latter is the
-same as a C<clone --force> operation, using the current remote and branch.
-
 Like the C<clone> command, C<pull> will squash all the changes (since the last
 pull or clone) into one commit. This keeps your mainline history nice and
 clean. You can easily see the subrepo's history with the C<git log> command:
@@ -230,10 +221,10 @@ clean. You can easily see the subrepo's history with the C<git log> command:
 
 The set of commands used above are described in detail below.
 
-The C<pull> command accepts the C<--all>, C<--branch=>, C<--edit>, C<--force>,
-C<--message=>, C<--remote=> and C<--update> options.
+The C<pull> command accepts the C<--all>, C<--branch=>, C<--edit>, C<--file>,
+C<--force>, C<--message=>, C<--remote=> and C<--update> options.
 
-=item C<< git subrepo push <subdir>|--all [<branch>] [-r <remote>] [-b <branch>] [-M|-R] [-u] [-f] [-s] [-N] >>
+=item C<< git subrepo push <subdir>|--all [<branch>] [-m msg] [--file=<msg file>] [-r <remote>] [-b <branch>] [-M|-R] [-u] [-f] [-s] [-N] >>
 
 Push a properly merged subrepo branch back upstream.
 
@@ -257,11 +248,9 @@ The C<--force> option will do a force push. Force pushes are typically
 discouraged. Only use this option if you fully understand it. (The C<--force>
 option will NOT check for a proper merge. ANY branch will be force pushed!)
 
-The C<push> command accepts the C<--all>, C<--branch=>, C<--dry-run>, C<--
-force>, C<--merge>, C<--rebase>, C<--remote=>, C<--squash> and C<--
-update> options.
+The C<push> command accepts the C<--all>, C<--branch=>, C<--dry-run>, C<--file>, C<--force>, C<--merge>, C<--message>, C<--rebase>, C<--remote=>, C<--squash> and C<--update> options.
 
-=item C<< git subrepo fetch <subdir>|--all [-r <remote>] [-b <branch>] >>
+=item C<< git subrepo fetch <subdir>|--force --all [-r <remote>] [-b <branch>] >>
 
 Fetch the remote/upstream content for a subrepo.
 
@@ -270,8 +259,7 @@ points at the same commit as C<FETCH_HEAD>. It will also create a remote
 called C<< subrepo/<subdir> >>. These are temporary and you can easily remove
 them with the subrepo C<clean> command.
 
-The C<fetch> command accepts the C<--all>, C<--branch=> and C<--
-remote=> options.
+The C<fetch> command accepts the C<--force>, C<--all>, C<--branch=> and C<--remote=> options.
 
 =item C<< git subrepo branch <subdir>|--all [-f] [-F] >>
 
@@ -287,12 +275,11 @@ Use the C<--force> option to write over an existing C<< subrepo/<subdir>
 
 The C<branch> command accepts the C<--all>, C<--fetch> and C<--force> options.
 
-=item C<< git subrepo commit <subdir> [<subrepo-ref>] [-m <msg>] [-e] [-f] [-F] >>
+=item C<< git subrepo commit <subdir> [<subrepo-ref>] [-m <msg>] [--file=<msg file>] [-e] [-f] [-F] >>
 
 Add subrepo branch to current history as a single commit.
 
-This command is generally used after a hand-merge. You have done a C<subrepo
-branch> and merged (rebased) it with the upstream. This command takes the HEAD
+This command is generally used after a hand-merge. You have done a C<subrepobranch> and merged (rebased) it with the upstream. This command takes the HEAD
 of that branch, puts its content into the subrepo subdir and adds a new commit
 for it to the top of your mainline history.
 
@@ -300,13 +287,12 @@ This command requires that the upstream HEAD be in the C<< subrepo/<subdir> >>
 branch history. That way the same branch can push upstream. Use the C<--force>
 option to commit anyway.
 
-The C<commit> command accepts the C<--edit>, C<--fetch>, C<--force> and C<--
-message=> options.
+The C<commit> command accepts the C<--edit>, C<--fetch>, C<--file>, C<--force>
+and C<--message=> options.
 
 =item C<< git subrepo status [<subdir>|--all|--ALL] [-F] [-q|-v] >>
 
-Get the status of a subrepo. Uses the C<--all> option by default. If the C<--
-quiet> flag is used, just print the subrepo names, one per line.
+Get the status of a subrepo. Uses the C<--all> option by default. If the C<--quiet> flag is used, just print the subrepo names, one per line.
 
 The C<--verbose> option will show all the recent local and upstream commits.
 
@@ -354,8 +340,8 @@ Example to update the C<method> option for a subrepo:
 Same as C<git help subrepo>. Will launch the manpage. For the shorter usage,
 use C<git subrepo -h>.
 
-Use C<< git subrepo help <command> to get help for a specific command. Use >>--
-all` to get a summary of all commands.
+Use C<< git subrepo help <command> >> to get help for a specific command. Use
+C<--all> to get a summary of all commands.
 
 The C<help> command accepts the C<--all> option.
 
@@ -423,6 +409,10 @@ Edit the commit message before committing.
 
 Use this option to fetch the upstream commits, before running the command.
 
+=item C<< --file=<commit msg file> >>
+
+Supply your own commit message from a file
+
 =item C<--force> (C<-f>)
 
 Use this option to force certain commands that fail in the general case.
@@ -493,8 +483,7 @@ The C<git-subrepo> command exports and honors some environment variables:
 
 =item C<GIT_SUBREPO_ROOT>
 
-This is set by the C<.rc> file, if you use that method to install / enable C<git-
-subrepo>. It contains the path of the C<git-subrepo> repository.
+This is set by the C<.rc> file, if you use that method to install / enable C<git-subrepo>. It contains the path of the C<git-subrepo> repository.
 
 =item C<GIT_SUBREPO_RUNNING>
 
@@ -653,8 +642,8 @@ function is called:
 
 =head1 Status
 
-The git-subrepo command has been in use for well over a year and seems to get
-the job done. Development is still ongoing but mostly just for fixing bugs.
+The git-subrepo command has been used in production and seems to get the job
+done. Development is still ongoing but mostly just for fixing bugs.
 
 Trying subrepo out is simple and painless (this is not C<git submodule>).
 Nothing is permanent (if you do not push to shared remotes). ie You can always
@@ -683,6 +672,75 @@ C<irc.freenode.net>.
 
 =back
 
+=head1 Working with nested subrepos
+
+C<git-subrepo> supports adding subrepos which themselves make use of subrepos.
+In fact, subrepo itself is built this way. Take a look in the C<ext/> folder,
+it houses 2 dependencies as subrepos, C<test-more-bash> and C<bashplus>.
+
+C<test-more-bash> itself depends on 2 more subrepos: C<bashplus> again, and
+C<test-tap-bash>.
+
+The structure is therefore as follows:
+
+    git-subrepo
+      |- bashplus
+      |- test-more-bash
+        |- bashplus
+        |- test-tap-bash
+
+However, it's important to understand how this works. Here's the key idea:
+There is B<no> special handling for nested subrepos.
+
+When you clone a subrepo, B<all> C<git-subrepo> does is download the code and
+set up the subrepo file. This means that all the subrepo commands simply act
+on the subrepo as a whole, treating nested subrepos like any other part of the
+source code.
+
+Let's look at what this means in practice. Say you have a structure as
+follows:
+
+    app-foo
+      |- barlib
+         |- bazlib
+
+You're working on app-foo, and make some changes to bazlib. How should you
+upstream these changes?
+
+From the perspective of app-foo, you've simply made some changes to barlib.
+Whether or not those changes were themselves in a subrepo is irrelevant. So,
+just like any other changes, you run
+
+C<git subrepo push barlib>
+
+Now, if C<barlib> is a library you don't maintain, your responsibility would
+end here. C<barlib>'s maintainer would see your changes and decide what to do
+with them.
+
+If you do maintain C<barlib>, you might now want to upstream the changes all
+the way into C<bazlib>. You could be tempted to try running something like:
+
+C<git subrepo push barlib/bazlib>
+
+but you'll soon find out that doesn't work. C<app-foo> doesn't know anything
+about the link between C<barlib> and C<bazlib>.
+
+What you should do is treat the changes to C<barlib> as if they would come
+from another contributor, aka:
+
+=over
+
+=item * go to a local copy of C<barlib>
+
+=item * pull down the changes with C<git pull>
+
+=item * you notice the changes include some work on your subrepo, time to upstream them: C<git subrepo push bazlib>
+
+=back
+
+And you're done! One final step you'll likely want to do is to go back to C<app-foo> and run C<git subrepo pull barlib>, because the push you just did added a
+new commit.
+
 =head1 Authors
 
 =over
@@ -691,12 +749,14 @@ C<irc.freenode.net>.
 
 =item * Magnus Carlsson <grimmymail@gmail.com>
 
+=item * Austin Morgan <admorgan@morgancomputers.net>
+
 =back
 
 =head1 License and Copyright
 
 The MIT License (MIT)
 
-Copyright (c) 2013-2018 Ingy döt Net
+Copyright (c) 2013-2024 Ingy döt Net
 
 =cut
diff --git a/doc/git-subrepo.swim b/doc/git-subrepo.swim
index 02f379b6..dfa2bed4 100644
--- a/doc/git-subrepo.swim
+++ b/doc/git-subrepo.swim
@@ -3,8 +3,6 @@ git-subrepo
 
 Git Submodule Alternative
 
-<badge travis ingydotnet/git-subrepo>
-
 = Synopsis
 
   git subrepo -h    # Help Overview
@@ -78,7 +76,7 @@ The best short answer is:
 
 The complete "Installation Instructions" can be found below.
 
-Note: git-subrepo needs a git version (> 2.5) that supports worktree:s.
+Note: git-subrepo needs a git version (> 2.7) that supports worktree:s.
 
 = Commands
 
@@ -90,7 +88,7 @@ experienced Git users.
 Please note that the commands are /not/ exact equivalents, and do not take all
 the same arguments. Keep reading…
 
-- `git subrepo clone <repository> [<subdir>] [-b <branch>] [-f] [-m <msg>] [-e] [--method <merge|rebase>]`
+- `git subrepo clone <repository> [<subdir>] [-b <branch>] [-f] [-m <msg>] [--file=<msg file>] [-e] [--method <merge|rebase>]`
 
   Add a repository as a subrepo in a subdir of your repository.
 
@@ -112,8 +110,8 @@ the same arguments. Keep reading…
   The `--method` option will decide how the join process between branches are
    performed. The default option is merge.
 
-  The `clone` command accepts the `--branch=` `--edit`, `--force` and
-  `--message=` options.
+  The `clone` command accepts the `--branch=` `--edit`, `--file`, `--force`
+  and `--message=` options.
 
 - `git subrepo init <subdir> [-r <remote>] [-b <branch>] [--method <merge|rebase>]`
 
@@ -128,7 +126,7 @@ the same arguments. Keep reading…
   If you specify the `--remote` (and optionally the `--branch`) option, the
   values will be added to the `<subdir>/.gitrepo` file. The `--remote` option
   is the upstream URL, and the `--branch` option is the upstream branch to push
-  to. These values will be needed to do a `git subrepo push` command, but they
+  to. These values will be needed to do a `git subrepo push` command, but they
   can be provided later on the `push` command (and saved to `<subdir>/.gitrepo`
   if you also specify the `--update` option).
 
@@ -140,7 +138,7 @@ the same arguments. Keep reading…
 
   The `init` command accepts the `--branch=` and `--remote=` options.
 
-- `git subrepo pull <subdir>|--all [-M|-R|-f] [-m <msg>] [-e] [-b <branch>] [-r <remote>] [-u]`
+- `git subrepo pull <subdir>|--all [-M|-R|-f] [-m <msg>] [--file=<msg file>] [-e] [-b <branch>] [-r <remote>] [-u]`
 
   Update the subrepo subdir with the latest upstream changes.
 
@@ -177,10 +175,6 @@ the same arguments. Keep reading…
   specify a `--rebase`, `--merge` or `--force` strategy. The latter is the same
   as a `clone --force` operation, using the current remote and branch.
 
-  When you pull you can assume a fast-forward strategy (default) or you can
-  specify a `--rebase`, `--merge` or `--force` strategy. The latter is the same
-  as a `clone --force` operation, using the current remote and branch.
-
   Like the `clone` command, `pull` will squash all the changes (since the last
   pull or clone) into one commit. This keeps your mainline history nice and
   clean. You can easily see the subrepo's history with the `git log` command:
@@ -189,10 +183,10 @@ the same arguments. Keep reading…
 
   The set of commands used above are described in detail below.
 
-  The `pull` command accepts the `--all`, `--branch=`, `--edit`, `--force`,
-  `--message=`, `--remote=` and `--update` options.
+  The `pull` command accepts the `--all`, `--branch=`, `--edit`, `--file`,
+  `--force`, `--message=`, `--remote=` and `--update` options.
 
-- `git subrepo push <subdir>|--all [<branch>] [-r <remote>] [-b <branch>] [-M|-R] [-u] [-f] [-s] [-N]`
+- `git subrepo push <subdir>|--all [<branch>] [-m msg] [--file=<msg file>] [-r <remote>] [-b <branch>] [-M|-R] [-u] [-f] [-s] [-N]`
 
   Push a properly merged subrepo branch back upstream.
 
@@ -216,10 +210,11 @@ the same arguments. Keep reading…
   discouraged. Only use this option if you fully understand it. (The `--force`
   option will NOT check for a proper merge. ANY branch will be force pushed!)
 
-  The `push` command accepts the `--all`, `--branch=`, `--dry-run`, `--force`,
-  `--merge`, `--rebase`, `--remote=`, `--squash` and `--update` options.
+  The `push` command accepts the `--all`, `--branch=`, `--dry-run`, `--file`,
+  `--force`, `--merge`, `--message`, `--rebase`, `--remote=`, `--squash` and
+  `--update` options.
 
-- `git subrepo fetch <subdir>|--all [-r <remote>] [-b <branch>]`
+- `git subrepo fetch <subdir>|--force --all [-r <remote>] [-b <branch>]`
 
   Fetch the remote/upstream content for a subrepo.
 
@@ -228,7 +223,7 @@ the same arguments. Keep reading…
   `subrepo/<subdir>`. These are temporary and you can easily remove them with
   the subrepo `clean` command.
 
-  The `fetch` command accepts the `--all`, `--branch=` and `--remote=` options.
+  The `fetch` command accepts the `--force`, `--all`, `--branch=` and `--remote=` options.
 
 - `git subrepo branch <subdir>|--all [-f] [-F]`
 
@@ -243,7 +238,7 @@ the same arguments. Keep reading…
 
   The `branch` command accepts the `--all`, `--fetch` and `--force` options.
 
-- `git subrepo commit <subdir> [<subrepo-ref>] [-m <msg>] [-e] [-f] [-F]`
+- `git subrepo commit <subdir> [<subrepo-ref>] [-m <msg>] [--file=<msg file>] [-e] [-f] [-F]`
 
   Add subrepo branch to current history as a single commit.
 
@@ -256,8 +251,8 @@ the same arguments. Keep reading…
   branch history. That way the same branch can push upstream. Use the
   `--force` option to commit anyway.
 
-  The `commit` command accepts the `--edit`, `--fetch`, `--force` and
-  `--message=` options.
+  The `commit` command accepts the `--edit`, `--fetch`, `--file`, `--force`
+  and `--message=` options.
 
 - `git subrepo status [<subdir>|--all|--ALL] [-F] [-q|-v]`
 
@@ -310,7 +305,7 @@ the same arguments. Keep reading…
   Same as `git help subrepo`. Will launch the manpage. For the shorter usage,
   use `git subrepo -h`.
 
-  Use `git subrepo help <command> to get help for a specific command. Use
+  Use `git subrepo help <command>` to get help for a specific command. Use
   `--all` to get a summary of all commands.
 
   The `help` command accepts the `--all` option.
@@ -374,6 +369,10 @@ the same arguments. Keep reading…
 
   Use this option to fetch the upstream commits, before running the command.
 
+- `--file=<commit msg file>`
+
+  Supply your own commit message from a file
+
 - `--force` (`-f`)
 
   Use this option to force certain commands that fail in the general case.
@@ -578,7 +577,7 @@ is called:
 
 = Status
 
-The git-subrepo command has been in use for well over a year and seems to get
+The git-subrepo command has been used in production and seems to get
 the job done. Development is still ongoing but mostly just for fixing bugs.
 
 Trying subrepo out is simple and painless (this is not `git submodule`).
@@ -600,13 +599,81 @@ If you want to chat about the `git-subrepo` command, join `#gitcommands` on
 * Written in (very modern) Bash, with full test suite. Take a look.
 * A `.gitrepo` file never is in the top level dir (next to a `.git/` dir).
 
+= Working with nested subrepos
+
+`git-subrepo` supports adding subrepos which themselves make use of
+subrepos. In fact, subrepo itself is built this way. Take a look in the
+`ext/` folder, it houses 2 dependencies as subrepos, `test-more-bash` and
+`bashplus`.
+
+`test-more-bash` itself depends on 2 more subrepos: `bashplus` again, and
+`test-tap-bash`.
+
+The structure is therefore as follows:
+
+  git-subrepo
+    |- bashplus
+    |- test-more-bash
+      |- bashplus
+      |- test-tap-bash
+
+However, it's important to understand how this works. Here's the key idea:
+There is *no* special handling for nested subrepos.
+
+When you clone a subrepo, *all* `git-subrepo` does is download the code
+and set up the subrepo file.
+This means that all the subrepo commands simply act on the subrepo as a whole,
+treating nested subrepos like any other part of the source code.
+
+Let's look at what this means in practice. Say you have a structure as follows:
+
+  app-foo
+    |- barlib
+       |- bazlib
+
+You're working on app-foo, and make some changes to bazlib. How should you
+upstream these changes?
+
+From the perspective of app-foo, you've simply made some changes to barlib.
+Whether or not those changes were themselves in a subrepo is irrelevant. So,
+just like any other changes, you run
+
+`git subrepo push barlib`
+
+Now, if `barlib` is a library you don't maintain, your responsibility would end
+here. `barlib`'s maintainer would see your changes and decide what to do with
+them.
+
+If you do maintain `barlib`, you might now want to upstream the changes all the
+way into `bazlib`. You could be tempted to try running something like:
+
+`git subrepo push barlib/bazlib`
+
+but you'll soon find out that doesn't work.
+`app-foo` doesn't know anything about the link between `barlib` and `bazlib`.
+
+What you should do is treat the changes to `barlib` as if they would come from
+another contributor, aka:
+
+* go to a local copy of `barlib`
+* pull down the changes with `git pull`
+* you notice the changes include some work on your subrepo, time to upstream
+  them:
+  `git subrepo push bazlib`
+
+And you're done! One final step you'll likely want to do is to go back to
+`app-foo` and run `git subrepo pull barlib`, because the push you just did added
+a new commit.
+
+
 = Authors
 
 * Ingy döt Net <ingy@ingy.net>
 * Magnus Carlsson <grimmymail@gmail.com>
+* Austin Morgan <admorgan@morgancomputers.net>
 
 = License and Copyright
 
 The MIT License (MIT)
 
-Copyright (c) 2013-2018 Ingy döt Net
+Copyright (c) 2013-2024 Ingy döt Net
diff --git a/doc/intro-to-subrepo.swim b/doc/intro-to-subrepo.swim
index 4a25bc2b..28666315 100644
--- a/doc/intro-to-subrepo.swim
+++ b/doc/intro-to-subrepo.swim
@@ -61,7 +61,7 @@ article is about.
 Submodules tend to receive a lot of bad press. Here's some of it:
 
 * http://ayende.com/blog/4746/the-problem-with-git-submodules
-* http://somethingsinistral.net/blog/git-submodules-are-probably-not-the-answer/
+* https://web.archive.org/web/20171101202911/http://somethingsinistral.net/blog/git-submodules-are-probably-not-the-answer/
 * http://codingkilledthecat.wordpress.com/2012/04/28/why-your-company-shouldnt-use-git-submodules/
 
 A quick recap of some of the good and bad things about submodules:
@@ -227,9 +227,7 @@ Good:
 * Pushed history is kept intact.
 * Creates a clean historical view. (See below)
 * Bash code is very simple and easy to follow.
-* Comprehensive test suite. Currently passing on travis:
-
-<badge travis ingydotnet/git-subrepo>
+* Comprehensive test suite.
 
 Bad:
 
@@ -320,10 +318,10 @@ The resulting history is:
 
 Compare that to *subtree*. This:
 
-  $ git subrepo add abc git@github.com:user/abc master
-  $ git subrepo add xyz git@github.com:user/def master
-  $ git subrepo pull abc git@github.com:user/abc master
-  $ git subrepo pull xyz git@github.com:user/def master
+  $ git subtree add abc git@github.com:user/abc master
+  $ git subtree add xyz git@github.com:user/def master
+  $ git subtree pull abc git@github.com:user/abc master
+  $ git subtree pull xyz git@github.com:user/def master
 
 Produces this:
 
diff --git a/ext/bashplus/.gitignore b/ext/bashplus/.gitignore
deleted file mode 100644
index e69de29b..00000000
diff --git a/ext/bashplus/.gitrepo b/ext/bashplus/.gitrepo
index c5177a2e..7b97d025 100644
--- a/ext/bashplus/.gitrepo
+++ b/ext/bashplus/.gitrepo
@@ -6,6 +6,7 @@
 [subrepo]
 	remote = git@github.com:ingydotnet/bashplus.git
 	branch = master
-	commit = d9183af6f46946fabdef1dd8f37824c042a378f8
-	parent = 9b8f13e94677b2680a33ad204bebadcdb1ff9081
-	cmdver = 0.3.0
+	commit = 030d196bf621e971e223e95e73c235e6992b85e0
+	parent = 2c14be68fc5196ed1210d759421b33ef91c3e3db
+	cmdver = 0.4.1
+	method = merge
diff --git a/ext/bashplus/Changes b/ext/bashplus/Changes
index 6efe9712..868e06a2 100644
--- a/ext/bashplus/Changes
+++ b/ext/bashplus/Changes
@@ -1,4 +1,23 @@
 ---
+version: 0.1.0
+date:    Sat 14 Nov 2020 10:14:14 AM EST
+changes:
+- Add tests for version-check
+- Improve version-check
+- Move PATH assignment into test/setup
+- Meta bashplus supports Bash 3.2
+---
+version: 0.0.9
+date:    Wed 11 Nov 2020 02:19:32 PM EST
+changes:
+- Apply shellcheck fixes
+- Modernize bash code
+---
+version: 0.0.8
+date:    Fri Aug 21 08:00:45 PDT 2020
+changes:
+- Support paths with spaces @admorgan++
+---
 version: 0.0.7
 date:    Sat Jan 23 16:28:59 PST 2016
 changes:
diff --git a/ext/bashplus/License b/ext/bashplus/License
index d6cc73ad..2f33d668 100644
--- a/ext/bashplus/License
+++ b/ext/bashplus/License
@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright © 2013-2016 Ingy döt Net
+Copyright © 2013-2020 Ingy döt Net
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the ‘Software’), to deal in
diff --git a/ext/bashplus/Makefile b/ext/bashplus/Makefile
index 6ec6d713..a9e035e3 100644
--- a/ext/bashplus/Makefile
+++ b/ext/bashplus/Makefile
@@ -15,6 +15,10 @@ INSTALL_DIR  ?= test
 INSTALL_MAN1 ?= $(shell bpan env BPAN_MAN1)
 INSTALL_MAN3 ?= $(shell bpan env BPAN_MAN3)
 
+DOCKER_IMAGE := ingy/bash-testing:0.0.1
+DOCKER_TESTS := 5.1 5.0 4.4 4.3 4.2 4.1 4.0 3.2
+DOCKER_TESTS := $(DOCKER_TESTS:%=docker-test-%)
+
 default: help
 
 help:
@@ -24,6 +28,13 @@ help:
 test:
 	prove $(PROVEOPT:%=% )test/
 
+test-all: test docker-test
+
+docker-test: $(DOCKER_TESTS)
+
+$(DOCKER_TESTS):
+	$(call docker-make-test,$(@:docker-test-%=%))
+
 install:
 	install -C -d -m 0755 $(INSTALL_LIB)/$(INSTALL_DIR)/
 	install -C -m 0755 $(LIB) $(INSTALL_LIB)/$(INSTALL_DIR)/
@@ -43,3 +54,17 @@ $(MAN1)/%.1: doc/%.swim
 
 $(MAN3)/%.3: doc/%.swim
 	swim --to=man $< > $@
+
+define docker-make-test
+	docker run -i -t --rm \
+	    -v $(PWD):/git-subrepo \
+	    -w /git-subrepo \
+	    $(DOCKER_IMAGE) \
+		/bin/bash -c ' \
+		    set -x && \
+		    [[ -d /bash-$(1) ]] && \
+		    export PATH=/bash-$(1)/bin:$$PATH && \
+		    bash --version && \
+		    make test \
+		'
+endef
diff --git a/ext/bashplus/Meta b/ext/bashplus/Meta
index c4bce38f..2431c2e5 100644
--- a/ext/bashplus/Meta
+++ b/ext/bashplus/Meta
@@ -1,12 +1,12 @@
 =meta: 0.0.2
 
 name: bashplus
-version: 0.0.7
+version: 0.1.0
 abstract: Modern Bash Programming
-homepage: http://bpan.org/package/bashplus/
+homepage: https://github.com/ingydotnet/bashplus
 
 license: MIT
-copyright: 2013-2016
+copyright: 2013-2020
 author:
   name: Ingy döt Net
   email: ingy@ingy.net
@@ -16,7 +16,7 @@ author:
   homepage: http://ingy.net
 
 requires:
-  bash: 3.2.0
+  bash: 3.2
 test:
   cmd: make test
 install:
diff --git a/ext/bashplus/ReadMe.pod b/ext/bashplus/ReadMe.pod
index bf2c421c..e9a143a7 100644
--- a/ext/bashplus/ReadMe.pod
+++ b/ext/bashplus/ReadMe.pod
@@ -1,7 +1,7 @@
 =pod
 
 =for comment
-DO NOT EDIT. This Pod was generated by Swim v0.1.41.
+DO NOT EDIT. This Pod was generated by Swim v0.1.48.
 See http://github.com/ingydotnet/swim-pm#readme
 
 =encoding utf8
@@ -70,7 +70,7 @@ Written by Ingy döt Net <ingy@ingy.net>
 
 =head1 Copyright & License
 
-Copyright 2013-2016. Ingy döt Net.
+Copyright 2013-2020. Ingy döt Net.
 
 The MIT License (MIT).
 
diff --git a/ext/bashplus/bin/bash+ b/ext/bashplus/bin/bash+
index 5178550c..a6914602 100755
--- a/ext/bashplus/bin/bash+
+++ b/ext/bashplus/bin/bash+
@@ -2,29 +2,30 @@
 #------------------------------------------------------------------------------
 # Bash+ - Modern Bash Programming
 #
-# Copyright (c) 2013-2016 Ingy döt Net
+# Copyright (c) 2013-2020 Ingy döt Net
 #------------------------------------------------------------------------------
 
 set -e
-shopt -s compat31&>/dev/null||:
+shopt -s compat31 &>/dev/null || true
 
 #------------------------------------------------------------------------------
 # Determine how `bash+` was called, and do the right thing:
 #------------------------------------------------------------------------------
-if [ "${BASH_SOURCE[0]}" != "$0" ]; then
+if [[ ${BASH_SOURCE[0]} != "$0" ]]; then
   # 'bash+' is being sourced:
-  [[ "${BASH_SOURCE[0]}" =~ /bin/bash\\+$ ]] || {
+  [[ ${BASH_SOURCE[0]} =~ /bin/bash\\+$ ]] || {
     echo "Invalid Bash+ path '${BASH_SOURCE[0]}'" 2> /dev/null
     exit 1
   }
   source "${BASH_SOURCE[0]%/bin/*}"/lib/bash+.bash || return $?
   bash+:import "$@"
   return $?
+
 else
-  if [ $# -eq 1 -a "$1" == --version ]; then
-    echo 'bash+   version 0.0.7'
+  if [[ $# -eq 1 ]] && [[ $1 == --version ]]; then
+    echo 'bash+   version 0.0.9'
   else
-  cat <<...
+    cat <<'...'
 
 Greetings modern Bash programmer. Welcome to Bash+!
 
diff --git a/ext/bashplus/doc/bash+.swim b/ext/bashplus/doc/bash+.swim
index 69739a19..4e4d94ef 100644
--- a/ext/bashplus/doc/bash+.swim
+++ b/ext/bashplus/doc/bash+.swim
@@ -56,6 +56,6 @@ Written by Ingy döt Net <ingy@ingy.net>
 
 = Copyright & License
 
-Copyright 2013-2016. Ingy döt Net.
+Copyright 2013-2020. Ingy döt Net.
 
 The MIT License (MIT).
diff --git a/ext/bashplus/lib/bash+.bash b/ext/bashplus/lib/bash+.bash
index e33f6261..55b1377a 100644
--- a/ext/bashplus/lib/bash+.bash
+++ b/ext/bashplus/lib/bash+.bash
@@ -1,34 +1,64 @@
 # bash+ - Modern Bash Programming
 #
-# Copyright (c) 2013-2016 Ingy döt Net
+# Copyright (c) 2013-2020 Ingy döt Net
 
-{
-  bash+:version-check() {
-    test $1 -ge 4 && return
-    test $1 -eq 3 -a $2 -ge 2 && return
-    echo "Bash version 3.2 or higher required for 'git hub'" >&2
-    exit 1
-  }
-  bash+:version-check "${BASH_VERSINFO[@]}"
-  unset -f Bash:version-check
+set -e
+
+[[ ${BASHPLUS_VERSION-} ]] && return 0
+
+BASHPLUS_VERSION=0.1.0
+
+bash+:version-check() {
+  local cmd want got out
+
+  IFS=' ' read -r -a cmd <<< "${1:?}"
+  IFS=. read -r -a want <<< "${2:?}"
+  : "${want[0]:=0}"
+  : "${want[1]:=0}"
+  : "${want[2]:=0}"
+
+  if [[ ${cmd[*]} == bash ]]; then
+    got=("${BASH_VERSINFO[@]}")
+    BASHPLUS_VERSION_CHECK=${BASH_VERSION-}
+  else
+    [[ ${#cmd[*]} -gt 1 ]] || cmd+=(--version)
+    out=$("${cmd[@]}") ||
+      { echo "Failed to run '${cmd[*]}'" >&2; exit 1; }
+    [[ $out =~ ([0-9]+\.[0-9]+(\.[0-9]+)?) ]] ||
+      { echo "Can't determine version number from '${cmd[*]}'" >&2; exit 1; }
+    BASHPLUS_VERSION_CHECK=${BASH_REMATCH[1]}
+    IFS=. read -r -a got <<< "$BASHPLUS_VERSION_CHECK"
+  fi
+  : "${got[2]:=0}"
+
+  (( got[0] > want[0] || ((
+     got[0] == want[0] && ((
+       got[1] > want[1] || ((
+       got[1] == want[1] && got[2] >= want[2]
+  )) )) )) ))
 }
 
-set -e
+bash+:version-check bash 3.2 ||
+  { echo "The 'bashplus' library requires 'Bash 3.2+'." >&2; exit 1; }
 
-[ -z "$BASHPLUS_VERSION" ] || return 0
+bash+:export:std() {
+  set -o pipefail
 
-BASHPLUS_VERSION='0.0.7'
+  if bash+:version-check bash 4.4; then
+    set -o nounset
+    shopt -s inherit_errexit
+  fi
 
-@() { echo "$@"; }
-bash+:export:std() { @ use die warn; }
+  echo use die warn
+}
 
 # Source a bash library call import on it:
 bash+:use() {
-  local library_name="${1:?bash+:use requires library name}"; shift
-  local library_path=; library_path="$(bash+:findlib $library_name)"
-  [[ -n $library_path ]] || {
+  local library_name=${1:?bash+:use requires library name}; shift
+  local library_path=; library_path=$(bash+:findlib "$library_name") || true
+  [[ $library_path ]] ||
     bash+:die "Can't find library '$library_name'." 1
-  }
+
   source "$library_path"
   if bash+:can "$library_name:import"; then
     "$library_name:import" "$@"
@@ -42,9 +72,11 @@ bash+:import() {
   local arg=
   for arg; do
     if [[ $arg =~ ^: ]]; then
-      bash+:import `bash+:export$arg`
+      # Word splitting required here
+      # shellcheck disable=2046
+      bash+:import $(bash+:export"$arg")
     else
-      bash+:fcopy bash+:$arg $arg
+      bash+:fcopy "bash+:$arg" "$arg"
     fi
   done
 }
@@ -53,38 +85,51 @@ bash+:import() {
 bash+:fcopy() {
   bash+:can "${1:?bash+:fcopy requires an input function name}" ||
     bash+:die "'$1' is not a function" 2
-  local func=; func=$(type "$1" 3>/dev/null | tail -n+3)
-  [[ -n $3 ]] && "$3"
+  local func
+  func=$(type "$1" 3>/dev/null | tail -n+3)
+  [[ ${3-} ]] && "$3"
   eval "${2:?bash+:fcopy requires an output function name}() $func"
 }
 
 # Find the path of a library
 bash+:findlib() {
-  local library_name=; library_name="$(tr 'A-Z' 'a-z' <<< "${1//:://}").bash"
-  local lib="${BASHPLUSLIB:-${BASHLIB:-$PATH}}"
-  library_name="${library_name//+/\\+}"
-  find ${lib//:/ } -name ${library_name##*/} 2>/dev/null |
+  local library_name
+  library_name=$(tr '[:upper:]' '[:lower:]' <<< "${1//:://}").bash
+  local lib=${BASHPLUSLIB:-${BASHLIB:-$PATH}}
+  library_name=${library_name//+/\\+}
+  IFS=':' read -r -a libs <<< "$lib"
+  find "${libs[@]}" -name "${library_name##*/}" 2>/dev/null |
     grep -E "$library_name\$" |
     head -n1
 }
 
 bash+:die() {
-  local msg="${1:-Died}"
-  printf "${msg//\\n/$'\n'}" >&2
-  local trailing_newline_re=$'\n''$'
-  [[ $msg =~ $trailing_newline_re ]] && exit 1
-
-  local c=($(caller ${DIE_STACK_LEVEL:-${2:-0}}))
-  (( ${#c[@]} == 2 )) &&
-    msg=" at line %d of %s" ||
+  local msg=${1:-Died}
+  msg=${msg//\\n/$'\n'}
+
+  printf "%s" "$msg" >&2
+  if [[ $msg == *$'\n' ]]; then
+    exit 1
+  else
+    printf "\n"
+  fi
+
+  local c
+  IFS=' ' read -r -a c <<< "$(caller "${DIE_STACK_LEVEL:-${2:-0}}")"
+  if (( ${#c[@]} == 2 )); then
+    msg=" at line %d of %s"
+  else
     msg=" at line %d in %s of %s"
-  printf "$msg\n" ${c[@]} >&2
+  fi
+
+  # shellcheck disable=2059
+  printf "$msg\n" "${c[@]}" >&2
   exit 1
 }
 
 bash+:warn() {
-  local msg="${1:-Warning}"
-  printf "${msg//\\n/$'\n'}\n" >&2
+  local msg=${1:-Warning}
+  printf "%s" "${msg//\\n/$'\n'}\n" >&2
 }
 
 bash+:can() {
diff --git a/ext/bashplus/man/man1/bash+.1 b/ext/bashplus/man/man1/bash+.1
index 91f821c7..7a9978e1 100644
--- a/ext/bashplus/man/man1/bash+.1
+++ b/ext/bashplus/man/man1/bash+.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -46,7 +46,7 @@
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
@@ -56,12 +56,12 @@
 ..
 .nr rF 0
 .if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
+.if (\n(rF:(\n(.g==0)) \{\
+.    if \nF \{\
 .        de IX
 .        tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.        if !\nF==2 \{
+.        if !\nF==2 \{\
 .            nr % 0
 .            nr F 2
 .        \}
@@ -70,8 +70,8 @@
 .rr rF
 .\" ========================================================================
 .\"
-.IX Title "Bash+(1) 1"
-.TH Bash+(1) 1 "January 2016" "Generated by Swim v0.1.41" "Modern Bash Programming"
+.IX Title "STDIN 1"
+.TH STDIN 1 "November 2020" "Generated by Swim v0.1.48" "Modern Bash Programming"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -129,6 +129,6 @@ If you are interested in chatting about this, \f(CW\*(C`/join #bpan\*(C'\fR on i
 Written by Ingy döt Net <ingy@ingy.net>
 .SH "Copyright & License"
 .IX Header "Copyright & License"
-Copyright 2013\-2016. Ingy döt Net.
+Copyright 2013\-2020. Ingy döt Net.
 .PP
 The \s-1MIT\s0 License (\s-1MIT\s0).
diff --git a/ext/bashplus/man/man3/bash+.3 b/ext/bashplus/man/man3/bash+.3
index 91f821c7..7a9978e1 100644
--- a/ext/bashplus/man/man3/bash+.3
+++ b/ext/bashplus/man/man3/bash+.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -46,7 +46,7 @@
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
@@ -56,12 +56,12 @@
 ..
 .nr rF 0
 .if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
+.if (\n(rF:(\n(.g==0)) \{\
+.    if \nF \{\
 .        de IX
 .        tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.        if !\nF==2 \{
+.        if !\nF==2 \{\
 .            nr % 0
 .            nr F 2
 .        \}
@@ -70,8 +70,8 @@
 .rr rF
 .\" ========================================================================
 .\"
-.IX Title "Bash+(1) 1"
-.TH Bash+(1) 1 "January 2016" "Generated by Swim v0.1.41" "Modern Bash Programming"
+.IX Title "STDIN 1"
+.TH STDIN 1 "November 2020" "Generated by Swim v0.1.48" "Modern Bash Programming"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -129,6 +129,6 @@ If you are interested in chatting about this, \f(CW\*(C`/join #bpan\*(C'\fR on i
 Written by Ingy döt Net <ingy@ingy.net>
 .SH "Copyright & License"
 .IX Header "Copyright & License"
-Copyright 2013\-2016. Ingy döt Net.
+Copyright 2013\-2020. Ingy döt Net.
 .PP
 The \s-1MIT\s0 License (\s-1MIT\s0).
diff --git a/ext/bashplus/test/base.t b/ext/bashplus/test/base.t
index 26e4d7f1..2fe7691a 100644
--- a/ext/bashplus/test/base.t
+++ b/ext/bashplus/test/base.t
@@ -1,12 +1,11 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 
-source test/test.bash
+source test/setup
 
-PATH=$PWD/bin:$PATH
 source bash+ :std
 
-ok $? '`source bash+` works'
+ok $? "'source bash+' works"
 
-is "$BASHPLUS_VERSION" '0.0.7' 'BASHPLUS_VERSION is 0.0.7'
+is "$BASHPLUS_VERSION" '0.1.0' 'BASHPLUS_VERSION is 0.1.0'
 
 done_testing 2
diff --git a/ext/bashplus/test/die.t b/ext/bashplus/test/die.t
new file mode 100644
index 00000000..8b3de435
--- /dev/null
+++ b/ext/bashplus/test/die.t
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+source test/setup
+
+source bash+ :std
+
+got=$(die "Nope" 2>&1) || true
+want="Nope
+ at line 7 in main of test/die.t"
+is "$got" "$want" "die() msg ok"
+
+got=$(die "Nope\n" 2>&1) || true
+want="Nope"
+is "$got" "$want" "die() msg ok"
+
+done_testing 2
diff --git a/ext/bashplus/test/fcopy.t b/ext/bashplus/test/fcopy.t
index 4e0a2d40..cd9a53d2 100644
--- a/ext/bashplus/test/fcopy.t
+++ b/ext/bashplus/test/fcopy.t
@@ -1,8 +1,7 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 
-source test/test.bash
+source test/setup
 
-PATH=$PWD/bin:$PATH
 source bash+
 
 foo() {
diff --git a/ext/test-more-bash/ext/bashplus/test/test.bash b/ext/bashplus/test/setup
similarity index 78%
rename from ext/test-more-bash/ext/bashplus/test/test.bash
rename to ext/bashplus/test/setup
index 751ac44d..c8b138d7 100644
--- a/ext/test-more-bash/ext/bashplus/test/test.bash
+++ b/ext/bashplus/test/setup
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
 
 #------------------------------------------------------------------------------
 # This is a tiny version of test-more-bash that I use here. test-more-bash uses
@@ -7,22 +7,28 @@
 # how nice Bash can be.
 #------------------------------------------------------------------------------
 
+set -e -o pipefail
+
+PATH=$PWD/bin:$PATH
+
+run=0
+
 plan() {
   echo "1..$1"
 }
 
 pass() {
-  let run=run+1
+  (( ++run ))
   echo "ok $run${1:+ - $1}"
 }
 
 fail() {
-  let run=run+1
+  (( ++run ))
   echo "not ok $run${1:+ - $1}"
 }
 
 is() {
-  if [ "$1" == "$2" ]; then
+  if [[ $1 == "$2" ]]; then
     pass "$3"
   else
     fail "$3"
@@ -32,13 +38,15 @@ is() {
 }
 
 ok() {
-  (exit ${1:-$?}) &&
-    pass "$2" ||
+  if (exit "${1:-$?}"); then
+    pass "$2"
+  else
     fail "$2"
+  fi
 }
 
 like() {
-  if [[ "$1" =~ "$2" ]]; then
+  if [[ $1 =~ $2 ]]; then
     pass "$3"
   else
     fail "$3"
@@ -48,7 +56,7 @@ like() {
 }
 
 unlike() {
-  if [[ ! "$1" =~ "$2" ]]; then
+  if [[ ! $1 =~ $2 ]]; then
     pass "$3"
   else
     fail "$3"
@@ -68,3 +76,5 @@ diag() {
 note() {
   echo "# ${1//$'\n'/$'\n'# }"
 }
+
+#! vim: ft=sh sw=2:
diff --git a/ext/bashplus/test/shellcheck.t b/ext/bashplus/test/shellcheck.t
new file mode 100644
index 00000000..d3745c9c
--- /dev/null
+++ b/ext/bashplus/test/shellcheck.t
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+source test/setup
+
+source bash+
+
+if ! command -v shellcheck >/dev/null; then
+  plan skip_all "The 'shellcheck' utility is not installed"
+fi
+if [[ ! $(shellcheck --version) =~ 0\.7\.1 ]]; then
+  plan skip_all "This test wants shellcheck version 0.7.1"
+fi
+
+IFS=$'\n' read -d '' -r -a shell_files <<< "$(
+  find bin -type f
+  find lib -type f
+  echo test/setup
+  find test -name '*.t'
+)" || true
+
+skips=(
+  # We want to keep these 2 here always:
+  SC1090  # Can't follow non-constant source. Use a directive to specify location.
+  SC1091  # Not following: bash+ was not specified as input (see shellcheck -x).
+)
+
+skip=$(IFS=,; echo "${skips[*]}")
+
+for file in "${shell_files[@]}"; do
+  [[ $file == *swp ]] && continue
+  is "$(shellcheck -e "$skip" "$file")" "" \
+    "The shell file '$file' passes shellcheck"
+done
+
+done_testing
+
+# vim: set ft=sh:
diff --git a/ext/bashplus/test/source-bash+-std.t b/ext/bashplus/test/source-bash+-std.t
index 097eae3f..b4bb1dfc 100644
--- a/ext/bashplus/test/source-bash+-std.t
+++ b/ext/bashplus/test/source-bash+-std.t
@@ -1,18 +1,17 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 
-source test/test.bash
+source test/setup
 
-PATH=$PWD/bin:$PATH
 source bash+ :std
 
-ok "`bash+:can use`"         'use is imported'
-ok "`bash+:can die`"         'die is imported'
-ok "`bash+:can warn`"        'warn is imported'
+ok "$(bash+:can use)"         'use is imported'
+ok "$(bash+:can die)"         'die is imported'
+ok "$(bash+:can warn)"        'warn is imported'
 
-ok "`! bash+:can import`"    'import is not imported'
-ok "`! bash+:can main`"      'main is not imported'
-ok "`! bash+:can fcopy`"     'fcopy is not imported'
-ok "`! bash+:can findlib`"   'findlib is not imported'
-ok "`! bash+:can can`"       'can is not imported'
+ok "$(! bash+:can import)"    'import is not imported'
+ok "$(! bash+:can main)"      'main is not imported'
+ok "$(! bash+:can fcopy)"     'fcopy is not imported'
+ok "$(! bash+:can findlib)"   'findlib is not imported'
+ok "$(! bash+:can can)"       'can is not imported'
 
 done_testing 8
diff --git a/ext/bashplus/test/source-bash+.t b/ext/bashplus/test/source-bash+.t
index 45eb070d..f54e2916 100644
--- a/ext/bashplus/test/source-bash+.t
+++ b/ext/bashplus/test/source-bash+.t
@@ -1,21 +1,20 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 
-source test/test.bash
+source test/setup
 
-PATH=$PWD/bin:$PATH
 source bash+
 
 functions=(
-    use
-    import
-    fcopy
-    findlib
-    die
-    warn
-    can
+  use
+  import
+  fcopy
+  findlib
+  die
+  warn
+  can
 )
 
-for f in ${functions[@]}; do
+for f in "${functions[@]}"; do
   is "$(type -t "bash+:$f")" function \
     "bash+:$f is a function"
 done
diff --git a/ext/bashplus/test/use.t b/ext/bashplus/test/use.t
index 9dea47b9..513b8350 100644
--- a/ext/bashplus/test/use.t
+++ b/ext/bashplus/test/use.t
@@ -1,18 +1,21 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 
-source test/test.bash
+source test/setup
 
-PATH=$PWD/bin:$PATH
 source bash+ :std can
 
+# shellcheck disable=2034
 BASHLIB=test/lib
 
 use Foo::Bar
+
 ok $?                         'use Foo::Bar - works'
-ok "`can Foo::Bar:baz`"       'Function Foo::Bar:baz exists'
+ok "$(can Foo::Bar:baz)"      'Function Foo::Bar:baz exists'
+
+# shellcheck disable=2016,2154
 is "$Foo__Bar_VERSION" 1.2.3  '$Foo__Bar_VERSION == 1.2.3'
 
-output=`use Foo::Foo Boo Booo`
+output=$(use Foo::Foo Boo Booo)
 ok $?                         'use Foo::Foo Boo Booo - works'
 is "$output" Boo---Booo       'Correct import called'
 
diff --git a/ext/bashplus/test/version-check.t b/ext/bashplus/test/version-check.t
new file mode 100644
index 00000000..4c07e14b
--- /dev/null
+++ b/ext/bashplus/test/version-check.t
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+source test/setup
+
+PATH=$PWD/bin:$PATH
+source bash+ version-check
+
+t1() (echo 0.1.2)
+t2() (echo 0.1)
+
+ok "$(version-check t1 0)" "0.1.2 >= 0"
+ok "$(version-check t1 0.1)" "0.1.2 >= 0.1"
+ok "$(version-check t1 0.1.1)" "0.1.2 >= 0.1.1"
+ok "$(version-check t1 0.1.2)" "0.1.2 >= 0.1.2"
+ok "$(! version-check t1 0.2)" "0.1.2 >= 0.2 fails"
+ok "$(! version-check t1 0.1.3)" "0.1.2 >= 0.1.3 fails"
+
+ok "$(version-check t2 0)" "0.1 >= 0"
+ok "$(version-check t2 0.1)" "0.1 >= 0.1"
+ok "$(! version-check t2 0.2)" "0.1 >= 0.2 fails"
+ok "$(! version-check t2 0.1.1)" "0.1 >= 0.1.1"
+
+done_testing 10
diff --git a/ext/test-more-bash/.gitrepo b/ext/test-more-bash/.gitrepo
index d8d80abd..192758fb 100644
--- a/ext/test-more-bash/.gitrepo
+++ b/ext/test-more-bash/.gitrepo
@@ -6,6 +6,7 @@
 [subrepo]
 	remote = git@github.com:ingydotnet/test-more-bash.git
 	branch = master
-	commit = 24a6cceabff4d62a5fd25b8945bab6f618fb0b88
-	parent = 69e22c2e7f6aeadfecb8b00d57c976958da03733
-	cmdver = 0.3.0
+	commit = c7df24fcb0814fbb62a33d92dc3c8d526ff710f0
+	parent = 914c2ae8e3b881f62ca987c1c3343df6a034d865
+	cmdver = 0.4.1
+	method = merge
diff --git a/ext/test-more-bash/Changes b/ext/test-more-bash/Changes
index 254e38fe..87440715 100644
--- a/ext/test-more-bash/Changes
+++ b/ext/test-more-bash/Changes
@@ -1,4 +1,15 @@
 ---
+version: 0.0.5
+date:    Wed 11 Nov 2020 02:33:42 PM EST
+changes:
+- Refactor to modern bash
+---
+version: 0.0.4
+date:    Fri Sep 4 12:26:58 2020 -0700
+changes:
+- Make up to date
+- Apply a few PRs
+---
 version: 0.0.3
 date:    Sat Jan 23 16:39:20 PST 2016
 changes:
diff --git a/ext/test-more-bash/License b/ext/test-more-bash/License
index 026b9850..9fdecd71 100644
--- a/ext/test-more-bash/License
+++ b/ext/test-more-bash/License
@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright © 2013-2016. Ingy döt Net.
+Copyright © 2013-2020. Ingy döt Net.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the ‘Software’), to deal in
diff --git a/ext/test-more-bash/Makefile b/ext/test-more-bash/Makefile
index 3ab51953..9a730702 100644
--- a/ext/test-more-bash/Makefile
+++ b/ext/test-more-bash/Makefile
@@ -2,6 +2,10 @@ NAME := test-more
 DOC  := doc/$(NAME).swim
 MAN3 := man/man3
 
+DOCKER_IMAGE := ingy/bash-testing:0.0.1
+DOCKER_TESTS := 5.1 5.0 4.4 4.3 4.2 4.1 4.0 3.2
+DOCKER_TESTS := $(DOCKER_TESTS:%=docker-test-%)
+
 default: help
 
 help:
@@ -11,6 +15,13 @@ help:
 test:
 	prove $(PROVEOPT:%=% )test/
 
+test-all: test docker-test
+
+docker-test: $(DOCKER_TESTS)
+
+$(DOCKER_TESTS):
+	$(call docker-make-test,$(@:docker-test-%=%))
+
 doc: ReadMe.pod $(MAN3)/$(NAME).3
 
 ReadMe.pod: $(DOC)
@@ -18,3 +29,17 @@ ReadMe.pod: $(DOC)
 
 $(MAN3)/%.3: doc/%.swim
 	swim --to=man $< > $@
+
+define docker-make-test
+	docker run -i -t --rm \
+	    -v $(PWD):/git-subrepo \
+	    -w /git-subrepo \
+	    $(DOCKER_IMAGE) \
+		/bin/bash -c ' \
+		    set -x && \
+		    [[ -d /bash-$(1) ]] && \
+		    export PATH=/bash-$(1)/bin:$$PATH && \
+		    bash --version && \
+		    make test \
+		'
+endef
diff --git a/ext/test-more-bash/Meta b/ext/test-more-bash/Meta
index 1e58234e..23f540f0 100644
--- a/ext/test-more-bash/Meta
+++ b/ext/test-more-bash/Meta
@@ -1,12 +1,12 @@
 =meta: 0.0.2
 
 name: test-more
-version: 0.0.3
+version: 0.0.5
 abstract: TAP Testing for Bash
 homepage: http://bpan.org/package/test-more/
 
 license: MIT
-copyright: 2013-2016
+copyright: 2013-2020
 author:
   name: Ingy döt Net
   email: ingy@ingy.net
@@ -16,9 +16,9 @@ author:
   homepage: http://ingy.net
 
 requires:
-  bash: 3.2.0
-  bashplus: 0.0.7
-  test-tap: 0.0.4
+  bash: 4.4.0
+  bashplus: 0.0.9
+  test-tap: 0.0.5
 test:
   cmd: make test
 install:
diff --git a/ext/test-more-bash/ReadMe.pod b/ext/test-more-bash/ReadMe.pod
index ee8d8dd0..40ba4bd0 100644
--- a/ext/test-more-bash/ReadMe.pod
+++ b/ext/test-more-bash/ReadMe.pod
@@ -1,7 +1,7 @@
 =pod
 
 =for comment
-DO NOT EDIT. This Pod was generated by Swim v0.1.41.
+DO NOT EDIT. This Pod was generated by Swim v0.1.48.
 See http://github.com/ingydotnet/swim-pm#readme
 
 =encoding utf8
@@ -54,6 +54,10 @@ Write a test file like this. Maybe call it C<test/test.t>:
 
     note "A message for stdout"
 
+    output=( $(ls) )
+    expected=(README lib bin)
+    cmp-array output expected "list files"
+
 Run the test with C<prove> like this:
 
     prove test/test.t
@@ -98,17 +102,19 @@ This is the basic usage:
 
 =item * C<BAIL_OUT "$reason">
 
+=item * `cmp-array output expected "message"
+
 =back
 
 More detailed info coming soon.
 
 =head1 Author
 
-Ingy döt Net <ingy@bpan.org>
+Ingy döt Net <ingy@ingy.net>
 
 =head1 Copyright & License
 
-Copyright 2013-2016. Ingy döt Net.
+Copyright 2013-2020. Ingy döt Net.
 
 The MIT License (MIT)
 
diff --git a/ext/test-more-bash/doc/test-more.swim b/ext/test-more-bash/doc/test-more.swim
index c3ad0b19..7687f63d 100644
--- a/ext/test-more-bash/doc/test-more.swim
+++ b/ext/test-more-bash/doc/test-more.swim
@@ -46,6 +46,10 @@ Write a test file like this. Maybe call it `test/test.t`:
 
   note "A message for stdout"
 
+  output=( $(ls) )
+  expected=(README lib bin)
+  cmp-array output expected "list files"
+
 Run the test with `prove` like this:
 
   prove test/test.t
@@ -75,15 +79,16 @@ This is the basic usage:
 * `done_testing $count`
 * `plan skip_all "$reason"`
 * `BAIL_OUT "$reason"`
+* `cmp-array output expected "message"
 
 More detailed info coming soon.
 
 = Author
 
-Ingy döt Net <ingy@bpan.org>
+Ingy döt Net <ingy@ingy.net>
 
 = Copyright & License
 
-Copyright 2013-2016. Ingy döt Net.
+Copyright 2013-2020. Ingy döt Net.
 
 The MIT License (MIT)
diff --git a/ext/test-more-bash/ext/bashplus/.gitignore b/ext/test-more-bash/ext/bashplus/.gitignore
deleted file mode 100644
index e69de29b..00000000
diff --git a/ext/test-more-bash/ext/bashplus/.gitrepo b/ext/test-more-bash/ext/bashplus/.gitrepo
index 97f817be..c56b46be 100644
--- a/ext/test-more-bash/ext/bashplus/.gitrepo
+++ b/ext/test-more-bash/ext/bashplus/.gitrepo
@@ -6,6 +6,7 @@
 [subrepo]
 	remote = git@github.com:ingydotnet/bashplus.git
 	branch = master
-	commit = d9183af6f46946fabdef1dd8f37824c042a378f8
-	parent = 05a1bddbe237bbf2c390048c80ca70d4f66c6a37
-	cmdver = 0.3.0
+	commit = e49f45a1457fed3cceb15bd4a82b0f7515efd8e5
+	parent = c978e2afd6861203138f28d0021e03fa1ffbba0c
+	cmdver = 0.4.1
+	method = merge
diff --git a/ext/test-more-bash/ext/bashplus/Changes b/ext/test-more-bash/ext/bashplus/Changes
index 6efe9712..645bd805 100644
--- a/ext/test-more-bash/ext/bashplus/Changes
+++ b/ext/test-more-bash/ext/bashplus/Changes
@@ -1,4 +1,15 @@
 ---
+version: 0.0.9
+date:    Wed 11 Nov 2020 02:19:32 PM EST
+changes:
+- Apply shellcheck fixes
+- Modernize bash code
+---
+version: 0.0.8
+date:    Fri Aug 21 08:00:45 PDT 2020
+changes:
+- Support paths with spaces @admorgan++
+---
 version: 0.0.7
 date:    Sat Jan 23 16:28:59 PST 2016
 changes:
diff --git a/ext/test-more-bash/ext/bashplus/License b/ext/test-more-bash/ext/bashplus/License
index d6cc73ad..2f33d668 100644
--- a/ext/test-more-bash/ext/bashplus/License
+++ b/ext/test-more-bash/ext/bashplus/License
@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright © 2013-2016 Ingy döt Net
+Copyright © 2013-2020 Ingy döt Net
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the ‘Software’), to deal in
diff --git a/ext/test-more-bash/ext/bashplus/Makefile b/ext/test-more-bash/ext/bashplus/Makefile
index 6ec6d713..a9e035e3 100644
--- a/ext/test-more-bash/ext/bashplus/Makefile
+++ b/ext/test-more-bash/ext/bashplus/Makefile
@@ -15,6 +15,10 @@ INSTALL_DIR  ?= test
 INSTALL_MAN1 ?= $(shell bpan env BPAN_MAN1)
 INSTALL_MAN3 ?= $(shell bpan env BPAN_MAN3)
 
+DOCKER_IMAGE := ingy/bash-testing:0.0.1
+DOCKER_TESTS := 5.1 5.0 4.4 4.3 4.2 4.1 4.0 3.2
+DOCKER_TESTS := $(DOCKER_TESTS:%=docker-test-%)
+
 default: help
 
 help:
@@ -24,6 +28,13 @@ help:
 test:
 	prove $(PROVEOPT:%=% )test/
 
+test-all: test docker-test
+
+docker-test: $(DOCKER_TESTS)
+
+$(DOCKER_TESTS):
+	$(call docker-make-test,$(@:docker-test-%=%))
+
 install:
 	install -C -d -m 0755 $(INSTALL_LIB)/$(INSTALL_DIR)/
 	install -C -m 0755 $(LIB) $(INSTALL_LIB)/$(INSTALL_DIR)/
@@ -43,3 +54,17 @@ $(MAN1)/%.1: doc/%.swim
 
 $(MAN3)/%.3: doc/%.swim
 	swim --to=man $< > $@
+
+define docker-make-test
+	docker run -i -t --rm \
+	    -v $(PWD):/git-subrepo \
+	    -w /git-subrepo \
+	    $(DOCKER_IMAGE) \
+		/bin/bash -c ' \
+		    set -x && \
+		    [[ -d /bash-$(1) ]] && \
+		    export PATH=/bash-$(1)/bin:$$PATH && \
+		    bash --version && \
+		    make test \
+		'
+endef
diff --git a/ext/test-more-bash/ext/bashplus/Meta b/ext/test-more-bash/ext/bashplus/Meta
index c4bce38f..3104879f 100644
--- a/ext/test-more-bash/ext/bashplus/Meta
+++ b/ext/test-more-bash/ext/bashplus/Meta
@@ -1,12 +1,12 @@
 =meta: 0.0.2
 
 name: bashplus
-version: 0.0.7
+version: 0.0.9
 abstract: Modern Bash Programming
 homepage: http://bpan.org/package/bashplus/
 
 license: MIT
-copyright: 2013-2016
+copyright: 2013-2020
 author:
   name: Ingy döt Net
   email: ingy@ingy.net
@@ -16,7 +16,7 @@ author:
   homepage: http://ingy.net
 
 requires:
-  bash: 3.2.0
+  bash: 4.4.0
 test:
   cmd: make test
 install:
diff --git a/ext/test-more-bash/ext/bashplus/ReadMe.pod b/ext/test-more-bash/ext/bashplus/ReadMe.pod
index bf2c421c..e9a143a7 100644
--- a/ext/test-more-bash/ext/bashplus/ReadMe.pod
+++ b/ext/test-more-bash/ext/bashplus/ReadMe.pod
@@ -1,7 +1,7 @@
 =pod
 
 =for comment
-DO NOT EDIT. This Pod was generated by Swim v0.1.41.
+DO NOT EDIT. This Pod was generated by Swim v0.1.48.
 See http://github.com/ingydotnet/swim-pm#readme
 
 =encoding utf8
@@ -70,7 +70,7 @@ Written by Ingy döt Net <ingy@ingy.net>
 
 =head1 Copyright & License
 
-Copyright 2013-2016. Ingy döt Net.
+Copyright 2013-2020. Ingy döt Net.
 
 The MIT License (MIT).
 
diff --git a/ext/test-more-bash/ext/bashplus/bin/bash+ b/ext/test-more-bash/ext/bashplus/bin/bash+
index 5178550c..a6914602 100755
--- a/ext/test-more-bash/ext/bashplus/bin/bash+
+++ b/ext/test-more-bash/ext/bashplus/bin/bash+
@@ -2,29 +2,30 @@
 #------------------------------------------------------------------------------
 # Bash+ - Modern Bash Programming
 #
-# Copyright (c) 2013-2016 Ingy döt Net
+# Copyright (c) 2013-2020 Ingy döt Net
 #------------------------------------------------------------------------------
 
 set -e
-shopt -s compat31&>/dev/null||:
+shopt -s compat31 &>/dev/null || true
 
 #------------------------------------------------------------------------------
 # Determine how `bash+` was called, and do the right thing:
 #------------------------------------------------------------------------------
-if [ "${BASH_SOURCE[0]}" != "$0" ]; then
+if [[ ${BASH_SOURCE[0]} != "$0" ]]; then
   # 'bash+' is being sourced:
-  [[ "${BASH_SOURCE[0]}" =~ /bin/bash\\+$ ]] || {
+  [[ ${BASH_SOURCE[0]} =~ /bin/bash\\+$ ]] || {
     echo "Invalid Bash+ path '${BASH_SOURCE[0]}'" 2> /dev/null
     exit 1
   }
   source "${BASH_SOURCE[0]%/bin/*}"/lib/bash+.bash || return $?
   bash+:import "$@"
   return $?
+
 else
-  if [ $# -eq 1 -a "$1" == --version ]; then
-    echo 'bash+   version 0.0.7'
+  if [[ $# -eq 1 ]] && [[ $1 == --version ]]; then
+    echo 'bash+   version 0.0.9'
   else
-  cat <<...
+    cat <<'...'
 
 Greetings modern Bash programmer. Welcome to Bash+!
 
diff --git a/ext/test-more-bash/ext/bashplus/doc/bash+.swim b/ext/test-more-bash/ext/bashplus/doc/bash+.swim
index 69739a19..4e4d94ef 100644
--- a/ext/test-more-bash/ext/bashplus/doc/bash+.swim
+++ b/ext/test-more-bash/ext/bashplus/doc/bash+.swim
@@ -56,6 +56,6 @@ Written by Ingy döt Net <ingy@ingy.net>
 
 = Copyright & License
 
-Copyright 2013-2016. Ingy döt Net.
+Copyright 2013-2020. Ingy döt Net.
 
 The MIT License (MIT).
diff --git a/ext/test-more-bash/ext/bashplus/lib/bash+.bash b/ext/test-more-bash/ext/bashplus/lib/bash+.bash
index e33f6261..2e1a70c2 100644
--- a/ext/test-more-bash/ext/bashplus/lib/bash+.bash
+++ b/ext/test-more-bash/ext/bashplus/lib/bash+.bash
@@ -1,34 +1,66 @@
 # bash+ - Modern Bash Programming
 #
-# Copyright (c) 2013-2016 Ingy döt Net
+# Copyright (c) 2013-2020 Ingy döt Net
 
-{
-  bash+:version-check() {
-    test $1 -ge 4 && return
-    test $1 -eq 3 -a $2 -ge 2 && return
-    echo "Bash version 3.2 or higher required for 'git hub'" >&2
-    exit 1
-  }
-  bash+:version-check "${BASH_VERSINFO[@]}"
-  unset -f Bash:version-check
+set -e
+
+[[ ${BASHPLUS_VERSION-} ]] && return 0
+
+BASHPLUS_VERSION=0.0.9
+
+bash+:version-check() {
+  local cmd want got out
+
+  IFS=' ' read -r -a cmd <<< "${1:?}"
+  IFS=. read -r -a want <<< "${2:?}"
+  : "${want[2]:=0}"
+
+  if [[ ${cmd[*]} == bash ]]; then
+    got=("${BASH_VERSINFO[@]}")
+    BASHPLUS_VERSION_CHECK=${BASH_VERSION-}
+  else
+    [[ ${#cmd[*]} -gt 1 ]] || cmd+=(--version)
+    out=$("${cmd[@]}") ||
+      { echo "Failed to run '${cmd[*]}'" >&2; exit 1; }
+    [[ $out =~ ([0-9]+\.[0-9]+(\.[0-9]+)?) ]] ||
+      { echo "Can't determine version number from '${cmd[*]}'" >&2; exit 1; }
+    BASHPLUS_VERSION_CHECK=${BASH_REMATCH[1]}
+    IFS=. read -r -a got <<< "$BASHPLUS_VERSION_CHECK"
+  fi
+  : "${got[2]:=0}"
+
+  ((
+    got[0] > want[0] ||
+    got[0] == want[0] && got[1] > want[1] ||
+    got[0] == want[0] && got[1] == want[1] && got[2] >= want[2]
+  )) || return 1
+
+  return 0
 }
 
-set -e
+bash+:version-check bash 3.2 ||
+  { echo "The 'bashplus' library requires 'Bash 3.2+'." >&2; exit 1; }
 
-[ -z "$BASHPLUS_VERSION" ] || return 0
+@() (echo "$@")  # XXX do we want to keep this?
 
-BASHPLUS_VERSION='0.0.7'
+bash+:export:std() {
+  set -o pipefail
 
-@() { echo "$@"; }
-bash+:export:std() { @ use die warn; }
+  if bash+:version-check bash 4.4; then
+    set -o nounset
+    shopt -s inherit_errexit
+  fi
+
+  echo use die warn
+}
 
 # Source a bash library call import on it:
 bash+:use() {
-  local library_name="${1:?bash+:use requires library name}"; shift
-  local library_path=; library_path="$(bash+:findlib $library_name)"
-  [[ -n $library_path ]] || {
+  local library_name=${1:?bash+:use requires library name}; shift
+  local library_path=; library_path=$(bash+:findlib "$library_name") || true
+  [[ $library_path ]] ||
     bash+:die "Can't find library '$library_name'." 1
-  }
+
   source "$library_path"
   if bash+:can "$library_name:import"; then
     "$library_name:import" "$@"
@@ -42,9 +74,11 @@ bash+:import() {
   local arg=
   for arg; do
     if [[ $arg =~ ^: ]]; then
-      bash+:import `bash+:export$arg`
+      # Word splitting required here
+      # shellcheck disable=2046
+      bash+:import $(bash+:export"$arg")
     else
-      bash+:fcopy bash+:$arg $arg
+      bash+:fcopy "bash+:$arg" "$arg"
     fi
   done
 }
@@ -53,38 +87,51 @@ bash+:import() {
 bash+:fcopy() {
   bash+:can "${1:?bash+:fcopy requires an input function name}" ||
     bash+:die "'$1' is not a function" 2
-  local func=; func=$(type "$1" 3>/dev/null | tail -n+3)
-  [[ -n $3 ]] && "$3"
+  local func
+  func=$(type "$1" 3>/dev/null | tail -n+3)
+  [[ ${3-} ]] && "$3"
   eval "${2:?bash+:fcopy requires an output function name}() $func"
 }
 
 # Find the path of a library
 bash+:findlib() {
-  local library_name=; library_name="$(tr 'A-Z' 'a-z' <<< "${1//:://}").bash"
-  local lib="${BASHPLUSLIB:-${BASHLIB:-$PATH}}"
-  library_name="${library_name//+/\\+}"
-  find ${lib//:/ } -name ${library_name##*/} 2>/dev/null |
+  local library_name
+  library_name=$(tr '[:upper:]' '[:lower:]' <<< "${1//:://}").bash
+  local lib=${BASHPLUSLIB:-${BASHLIB:-$PATH}}
+  library_name=${library_name//+/\\+}
+  IFS=':' read -r -a libs <<< "$lib"
+  find "${libs[@]}" -name "${library_name##*/}" 2>/dev/null |
     grep -E "$library_name\$" |
     head -n1
 }
 
 bash+:die() {
-  local msg="${1:-Died}"
-  printf "${msg//\\n/$'\n'}" >&2
-  local trailing_newline_re=$'\n''$'
-  [[ $msg =~ $trailing_newline_re ]] && exit 1
-
-  local c=($(caller ${DIE_STACK_LEVEL:-${2:-0}}))
-  (( ${#c[@]} == 2 )) &&
-    msg=" at line %d of %s" ||
+  local msg=${1:-Died}
+  msg=${msg//\\n/$'\n'}
+
+  printf "%s" "$msg" >&2
+  if [[ $msg == *$'\n' ]]; then
+    exit 1
+  else
+    printf "\n"
+  fi
+
+  local c
+  IFS=' ' read -r -a c <<< "$(caller "${DIE_STACK_LEVEL:-${2:-0}}")"
+  if (( ${#c[@]} == 2 )); then
+    msg=" at line %d of %s"
+  else
     msg=" at line %d in %s of %s"
-  printf "$msg\n" ${c[@]} >&2
+  fi
+
+  # shellcheck disable=2059
+  printf "$msg\n" "${c[@]}" >&2
   exit 1
 }
 
 bash+:warn() {
-  local msg="${1:-Warning}"
-  printf "${msg//\\n/$'\n'}\n" >&2
+  local msg=${1:-Warning}
+  printf "%s" "${msg//\\n/$'\n'}\n" >&2
 }
 
 bash+:can() {
diff --git a/ext/test-more-bash/ext/bashplus/man/man1/bash+.1 b/ext/test-more-bash/ext/bashplus/man/man1/bash+.1
index 91f821c7..7a9978e1 100644
--- a/ext/test-more-bash/ext/bashplus/man/man1/bash+.1
+++ b/ext/test-more-bash/ext/bashplus/man/man1/bash+.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -46,7 +46,7 @@
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
@@ -56,12 +56,12 @@
 ..
 .nr rF 0
 .if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
+.if (\n(rF:(\n(.g==0)) \{\
+.    if \nF \{\
 .        de IX
 .        tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.        if !\nF==2 \{
+.        if !\nF==2 \{\
 .            nr % 0
 .            nr F 2
 .        \}
@@ -70,8 +70,8 @@
 .rr rF
 .\" ========================================================================
 .\"
-.IX Title "Bash+(1) 1"
-.TH Bash+(1) 1 "January 2016" "Generated by Swim v0.1.41" "Modern Bash Programming"
+.IX Title "STDIN 1"
+.TH STDIN 1 "November 2020" "Generated by Swim v0.1.48" "Modern Bash Programming"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -129,6 +129,6 @@ If you are interested in chatting about this, \f(CW\*(C`/join #bpan\*(C'\fR on i
 Written by Ingy döt Net <ingy@ingy.net>
 .SH "Copyright & License"
 .IX Header "Copyright & License"
-Copyright 2013\-2016. Ingy döt Net.
+Copyright 2013\-2020. Ingy döt Net.
 .PP
 The \s-1MIT\s0 License (\s-1MIT\s0).
diff --git a/ext/test-more-bash/ext/bashplus/man/man3/bash+.3 b/ext/test-more-bash/ext/bashplus/man/man3/bash+.3
index 91f821c7..7a9978e1 100644
--- a/ext/test-more-bash/ext/bashplus/man/man3/bash+.3
+++ b/ext/test-more-bash/ext/bashplus/man/man3/bash+.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -46,7 +46,7 @@
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
@@ -56,12 +56,12 @@
 ..
 .nr rF 0
 .if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
+.if (\n(rF:(\n(.g==0)) \{\
+.    if \nF \{\
 .        de IX
 .        tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.        if !\nF==2 \{
+.        if !\nF==2 \{\
 .            nr % 0
 .            nr F 2
 .        \}
@@ -70,8 +70,8 @@
 .rr rF
 .\" ========================================================================
 .\"
-.IX Title "Bash+(1) 1"
-.TH Bash+(1) 1 "January 2016" "Generated by Swim v0.1.41" "Modern Bash Programming"
+.IX Title "STDIN 1"
+.TH STDIN 1 "November 2020" "Generated by Swim v0.1.48" "Modern Bash Programming"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -129,6 +129,6 @@ If you are interested in chatting about this, \f(CW\*(C`/join #bpan\*(C'\fR on i
 Written by Ingy döt Net <ingy@ingy.net>
 .SH "Copyright & License"
 .IX Header "Copyright & License"
-Copyright 2013\-2016. Ingy döt Net.
+Copyright 2013\-2020. Ingy döt Net.
 .PP
 The \s-1MIT\s0 License (\s-1MIT\s0).
diff --git a/ext/test-more-bash/ext/bashplus/test/base.t b/ext/test-more-bash/ext/bashplus/test/base.t
index 26e4d7f1..35d5e505 100644
--- a/ext/test-more-bash/ext/bashplus/test/base.t
+++ b/ext/test-more-bash/ext/bashplus/test/base.t
@@ -1,12 +1,12 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 
-source test/test.bash
+source test/setup
 
 PATH=$PWD/bin:$PATH
 source bash+ :std
 
-ok $? '`source bash+` works'
+ok $? "'source bash+' works"
 
-is "$BASHPLUS_VERSION" '0.0.7' 'BASHPLUS_VERSION is 0.0.7'
+is "$BASHPLUS_VERSION" '0.0.9' 'BASHPLUS_VERSION is 0.0.9'
 
 done_testing 2
diff --git a/ext/test-more-bash/ext/bashplus/test/die.t b/ext/test-more-bash/ext/bashplus/test/die.t
new file mode 100644
index 00000000..42dabf8e
--- /dev/null
+++ b/ext/test-more-bash/ext/bashplus/test/die.t
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+source test/setup
+
+PATH=$PWD/bin:$PATH
+source bash+ :std
+
+got=$(die "Nope" 2>&1) || true
+want="Nope
+ at line 8 in main of test/die.t"
+is "$got" "$want" "die() msg ok"
+
+got=$(die "Nope\n" 2>&1) || true
+want="Nope"
+is "$got" "$want" "die() msg ok"
+
+done_testing 2
diff --git a/ext/test-more-bash/ext/bashplus/test/fcopy.t b/ext/test-more-bash/ext/bashplus/test/fcopy.t
index 4e0a2d40..47ef6ec1 100644
--- a/ext/test-more-bash/ext/bashplus/test/fcopy.t
+++ b/ext/test-more-bash/ext/bashplus/test/fcopy.t
@@ -1,6 +1,6 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 
-source test/test.bash
+source test/setup
 
 PATH=$PWD/bin:$PATH
 source bash+
diff --git a/ext/bashplus/test/test.bash b/ext/test-more-bash/ext/bashplus/test/setup
similarity index 77%
rename from ext/bashplus/test/test.bash
rename to ext/test-more-bash/ext/bashplus/test/setup
index 751ac44d..35124d0f 100644
--- a/ext/bashplus/test/test.bash
+++ b/ext/test-more-bash/ext/bashplus/test/setup
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
 
 #------------------------------------------------------------------------------
 # This is a tiny version of test-more-bash that I use here. test-more-bash uses
@@ -7,22 +7,27 @@
 # how nice Bash can be.
 #------------------------------------------------------------------------------
 
+set -e -u -o pipefail
+[[ $BASH_VERSION == 4.0* ]] && set +u
+
+run=0
+
 plan() {
   echo "1..$1"
 }
 
 pass() {
-  let run=run+1
+  (( ++run ))
   echo "ok $run${1:+ - $1}"
 }
 
 fail() {
-  let run=run+1
+  (( ++run ))
   echo "not ok $run${1:+ - $1}"
 }
 
 is() {
-  if [ "$1" == "$2" ]; then
+  if [[ $1 == "$2" ]]; then
     pass "$3"
   else
     fail "$3"
@@ -32,13 +37,15 @@ is() {
 }
 
 ok() {
-  (exit ${1:-$?}) &&
-    pass "$2" ||
+  if (exit "${1:-$?}"); then
+    pass "$2"
+  else
     fail "$2"
+  fi
 }
 
 like() {
-  if [[ "$1" =~ "$2" ]]; then
+  if [[ $1 =~ $2 ]]; then
     pass "$3"
   else
     fail "$3"
@@ -48,7 +55,7 @@ like() {
 }
 
 unlike() {
-  if [[ ! "$1" =~ "$2" ]]; then
+  if [[ ! $1 =~ $2 ]]; then
     pass "$3"
   else
     fail "$3"
@@ -68,3 +75,5 @@ diag() {
 note() {
   echo "# ${1//$'\n'/$'\n'# }"
 }
+
+#! vim: ft=sh sw=2:
diff --git a/ext/test-more-bash/ext/bashplus/test/shellcheck.t b/ext/test-more-bash/ext/bashplus/test/shellcheck.t
new file mode 100644
index 00000000..fcc0c97a
--- /dev/null
+++ b/ext/test-more-bash/ext/bashplus/test/shellcheck.t
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+source test/setup
+
+PATH=$PWD/bin:$PATH
+source bash+
+
+if ! command -v shellcheck >/dev/null; then
+  plan skip_all "The 'shellcheck' utility is not installed"
+fi
+if [[ ! $(shellcheck --version) =~ 0\.7\.1 ]]; then
+  plan skip_all "This test wants shellcheck version 0.7.1"
+fi
+
+IFS=$'\n' read -d '' -r -a shell_files <<< "$(
+  find bin -type f
+  find lib -type f
+  echo test/setup
+  find test -name '*.t'
+)" || true
+
+skips=(
+  # We want to keep these 2 here always:
+  SC1090  # Can't follow non-constant source. Use a directive to specify location.
+  SC1091  # Not following: bash+ was not specified as input (see shellcheck -x).
+)
+
+skip=$(IFS=,; echo "${skips[*]}")
+
+for file in "${shell_files[@]}"; do
+  [[ $file == *swp ]] && continue
+  is "$(shellcheck -e "$skip" "$file")" "" \
+    "The shell file '$file' passes shellcheck"
+done
+
+done_testing
+
+# vim: set ft=sh:
diff --git a/ext/test-more-bash/ext/bashplus/test/source-bash+-std.t b/ext/test-more-bash/ext/bashplus/test/source-bash+-std.t
index 097eae3f..71574f4f 100644
--- a/ext/test-more-bash/ext/bashplus/test/source-bash+-std.t
+++ b/ext/test-more-bash/ext/bashplus/test/source-bash+-std.t
@@ -1,18 +1,18 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 
-source test/test.bash
+source test/setup
 
 PATH=$PWD/bin:$PATH
 source bash+ :std
 
-ok "`bash+:can use`"         'use is imported'
-ok "`bash+:can die`"         'die is imported'
-ok "`bash+:can warn`"        'warn is imported'
+ok "$(bash+:can use)"         'use is imported'
+ok "$(bash+:can die)"         'die is imported'
+ok "$(bash+:can warn)"        'warn is imported'
 
-ok "`! bash+:can import`"    'import is not imported'
-ok "`! bash+:can main`"      'main is not imported'
-ok "`! bash+:can fcopy`"     'fcopy is not imported'
-ok "`! bash+:can findlib`"   'findlib is not imported'
-ok "`! bash+:can can`"       'can is not imported'
+ok "$(! bash+:can import)"    'import is not imported'
+ok "$(! bash+:can main)"      'main is not imported'
+ok "$(! bash+:can fcopy)"     'fcopy is not imported'
+ok "$(! bash+:can findlib)"   'findlib is not imported'
+ok "$(! bash+:can can)"       'can is not imported'
 
 done_testing 8
diff --git a/ext/test-more-bash/ext/bashplus/test/source-bash+.t b/ext/test-more-bash/ext/bashplus/test/source-bash+.t
index 45eb070d..539b8bfb 100644
--- a/ext/test-more-bash/ext/bashplus/test/source-bash+.t
+++ b/ext/test-more-bash/ext/bashplus/test/source-bash+.t
@@ -1,21 +1,21 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 
-source test/test.bash
+source test/setup
 
 PATH=$PWD/bin:$PATH
 source bash+
 
 functions=(
-    use
-    import
-    fcopy
-    findlib
-    die
-    warn
-    can
+  use
+  import
+  fcopy
+  findlib
+  die
+  warn
+  can
 )
 
-for f in ${functions[@]}; do
+for f in "${functions[@]}"; do
   is "$(type -t "bash+:$f")" function \
     "bash+:$f is a function"
 done
diff --git a/ext/test-more-bash/ext/bashplus/test/use.t b/ext/test-more-bash/ext/bashplus/test/use.t
index 9dea47b9..e9aafcb8 100644
--- a/ext/test-more-bash/ext/bashplus/test/use.t
+++ b/ext/test-more-bash/ext/bashplus/test/use.t
@@ -1,18 +1,22 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
 
-source test/test.bash
+source test/setup
 
 PATH=$PWD/bin:$PATH
 source bash+ :std can
 
+# shellcheck disable=2034
 BASHLIB=test/lib
 
 use Foo::Bar
+
 ok $?                         'use Foo::Bar - works'
-ok "`can Foo::Bar:baz`"       'Function Foo::Bar:baz exists'
+ok "$(can Foo::Bar:baz)"      'Function Foo::Bar:baz exists'
+
+# shellcheck disable=2016,2154
 is "$Foo__Bar_VERSION" 1.2.3  '$Foo__Bar_VERSION == 1.2.3'
 
-output=`use Foo::Foo Boo Booo`
+output=$(use Foo::Foo Boo Booo)
 ok $?                         'use Foo::Foo Boo Booo - works'
 is "$output" Boo---Booo       'Correct import called'
 
diff --git a/ext/test-more-bash/ext/test-tap-bash/.gitrepo b/ext/test-more-bash/ext/test-tap-bash/.gitrepo
index 92d0eddc..a6b1a06a 100644
--- a/ext/test-more-bash/ext/test-tap-bash/.gitrepo
+++ b/ext/test-more-bash/ext/test-tap-bash/.gitrepo
@@ -6,6 +6,7 @@
 [subrepo]
 	remote = git@github.com:ingydotnet/test-tap-bash.git
 	branch = master
-	commit = 7890df93f13e684715750a2d6a608e7e79671ca4
-	parent = 3faca582ee96a320b5675ad67b47ad0f16730446
-	cmdver = 0.3.0
+	commit = a9b33446848440a445f664a942f676d726788eff
+	parent = 24ba0cb0c97d2591cfc2c106a70b1d1f8c559e01
+	cmdver = 0.4.1
+	method = merge
diff --git a/ext/test-more-bash/ext/test-tap-bash/.travis.yml b/ext/test-more-bash/ext/test-tap-bash/.travis.yml
index 8c7bcad5..5d433e92 100644
--- a/ext/test-more-bash/ext/test-tap-bash/.travis.yml
+++ b/ext/test-more-bash/ext/test-tap-bash/.travis.yml
@@ -2,5 +2,4 @@
 language: c
 
 script:
-- git submodule update --init --recursive
-- PROVEOPT=-v make test
+- make test PROVEOPT=-v
diff --git a/ext/test-more-bash/ext/test-tap-bash/Changes b/ext/test-more-bash/ext/test-tap-bash/Changes
index 1fdc3e7f..01b07c6c 100644
--- a/ext/test-more-bash/ext/test-tap-bash/Changes
+++ b/ext/test-more-bash/ext/test-tap-bash/Changes
@@ -1,4 +1,15 @@
 ---
+version: 0.0.6
+date:    Tue 03 Nov 2020 05:20:54 PM EST
+changes:
+- Workaround for bash 4.0 bug
+- Docker testing for all bash versions
+---
+version: 0.0.5
+date:    Tue 03 Nov 2020 01:15:41 PM EST
+changes:
+- Use more modern Bash idioms
+---
 version: 0.0.4
 date:    Sat Jan 23 16:32:22 PST 2016
 changes:
diff --git a/ext/test-more-bash/ext/test-tap-bash/License b/ext/test-more-bash/ext/test-tap-bash/License
index 026b9850..9fdecd71 100644
--- a/ext/test-more-bash/ext/test-tap-bash/License
+++ b/ext/test-more-bash/ext/test-tap-bash/License
@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright © 2013-2016. Ingy döt Net.
+Copyright © 2013-2020. Ingy döt Net.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the ‘Software’), to deal in
diff --git a/ext/test-more-bash/ext/test-tap-bash/Makefile b/ext/test-more-bash/ext/test-tap-bash/Makefile
index 5c6a4ea6..7e75c236 100644
--- a/ext/test-more-bash/ext/test-tap-bash/Makefile
+++ b/ext/test-more-bash/ext/test-tap-bash/Makefile
@@ -1,3 +1,5 @@
+SHELL := bash
+
 ifeq ($(MAKECMDGOALS),install)
   ifeq "$(shell bpan version 2>/dev/null)" ""
     $(error 'BPAN not installed. See http://bpan.org')
@@ -12,6 +14,8 @@ INSTALL_LIB  ?= $(shell bpan env BPAN_LIB)
 INSTALL_DIR  ?= test
 INSTALL_MAN3 ?= $(shell bpan env BPAN_MAN3)
 
+DOCKER_IMAGE := ingy/bash-testing:0.0.1
+
 default: help
 
 help:
@@ -21,6 +25,18 @@ help:
 test:
 	prove $(PROVEOPT:%=% )test/
 
+test-all: test docker-test
+
+docker-test:
+	-$(call docker-make-test,3.2)
+	-$(call docker-make-test,4.0)
+	-$(call docker-make-test,4.1)
+	-$(call docker-make-test,4.2)
+	-$(call docker-make-test,4.3)
+	-$(call docker-make-test,4.4)
+	-$(call docker-make-test,5.0)
+	-$(call docker-make-test,5.1)
+
 install:
 	install -C -d -m 0755 $(INSTALL_LIB)/$(INSTALL_DIR)/
 	install -C -m 0755 $(LIB) $(INSTALL_LIB)/$(INSTALL_DIR)/
@@ -35,3 +51,17 @@ ReadMe.pod: doc/test-tap.swim
 
 man/man3/%.3: doc/%.swim
 	swim --to=man $< > $@
+
+define docker-make-test
+	docker run -i -t --rm \
+	    -v $(PWD):/git-subrepo \
+	    -w /git-subrepo \
+	    $(DOCKER_IMAGE) \
+		/bin/bash -c ' \
+		    set -x && \
+		    [[ -d /bash-$(1) ]] && \
+		    export PATH=/bash-$(1)/bin:$$PATH && \
+		    bash --version && \
+		    make test \
+		'
+endef
diff --git a/ext/test-more-bash/ext/test-tap-bash/Meta b/ext/test-more-bash/ext/test-tap-bash/Meta
index fb212b5c..db06a608 100644
--- a/ext/test-more-bash/ext/test-tap-bash/Meta
+++ b/ext/test-more-bash/ext/test-tap-bash/Meta
@@ -1,12 +1,12 @@
 =meta: 0.0.2
 
 name: test-tap
-version: 0.0.4
+version: 0.0.6
 abstract: TAP Test Base for Bash
 homepage: http://bpan.org/package/test-tap/
 
 license: MIT
-copyright: 2013-2016
+copyright: 2013-2020
 author:
   name: Ingy döt Net
   email: ingy@ingy.net
@@ -16,7 +16,7 @@ author:
   homepage: http://ingy.net
 
 requires:
-  bash: 3.2.0
+  bash: 3.2.57
 test:
   cmd: make test
 install:
diff --git a/ext/test-more-bash/ext/test-tap-bash/ReadMe.pod b/ext/test-more-bash/ext/test-tap-bash/ReadMe.pod
index 45f277a4..aced80a8 100644
--- a/ext/test-more-bash/ext/test-tap-bash/ReadMe.pod
+++ b/ext/test-more-bash/ext/test-tap-bash/ReadMe.pod
@@ -1,7 +1,7 @@
 =pod
 
 =for comment
-DO NOT EDIT. This Pod was generated by Swim v0.1.41.
+DO NOT EDIT. This Pod was generated by Swim v0.1.48.
 See http://github.com/ingydotnet/swim-pm#readme
 
 =encoding utf8
@@ -59,7 +59,7 @@ Written by Ingy döt Net <ingy@ingy.net>
 
 =head1 Copyright & License
 
-Copyright 2013-2016. Ingy döt Net.
+Copyright 2013-2020. Ingy döt Net.
 
 The MIT License (MIT).
 
diff --git a/ext/test-more-bash/ext/test-tap-bash/doc/test-tap.swim b/ext/test-more-bash/ext/test-tap-bash/doc/test-tap.swim
index 4ec3f1fb..a27c18ee 100644
--- a/ext/test-more-bash/ext/test-tap-bash/doc/test-tap.swim
+++ b/ext/test-more-bash/ext/test-tap-bash/doc/test-tap.swim
@@ -43,6 +43,6 @@ Written by Ingy döt Net <ingy@ingy.net>
 
 = Copyright & License
 
-Copyright 2013-2016. Ingy döt Net.
+Copyright 2013-2020. Ingy döt Net.
 
 The MIT License (MIT).
diff --git a/ext/test-more-bash/ext/test-tap-bash/lib/test/tap.bash b/ext/test-more-bash/ext/test-tap-bash/lib/test/tap.bash
index 276a595c..cc34dcb9 100644
--- a/ext/test-more-bash/ext/test-tap-bash/lib/test/tap.bash
+++ b/ext/test-more-bash/ext/test-tap-bash/lib/test/tap.bash
@@ -1,22 +1,26 @@
 # test/tap.bash - TAP Testing Foundation for Bash
 #
-# Copyright (c) 2013-2016. Ingy döt Net.
+# Copyright (c) 2013-2020. Ingy döt Net.
 
 #------------------------------------------------------------------------------
 Test::Tap:die() { echo "$@" >&2; trap EXIT; exit 1; }
 #------------------------------------------------------------------------------
 
-Test__Tap_VERSION=0.0.4
+set -e -u -o pipefail
+[[ ${BASH_VERSION-} == 4.0* ]] && set +u
+
+# shellcheck disable=2034
+Test__Tap_VERSION=0.0.6
 
 Test::Tap:init() {
-  [ -n "$BASH_SOURCE" ] ||
+  [[ ${BASH_SOURCE[0]} ]] ||
     Test::Tap:die "Error: test-tap-bash must be run under Bash only"
   Test__Tap_plan=0
   Test__Tap_run=0
   Test__Tap_failed=0
-  Test__Tap_pid=$BASHPID
+  Test__Tap_pid=${BASHPID:-0}
 
-  if [ $# -gt 0 ]; then
+  if [[ $# -gt 0 ]]; then
     [[ $# -eq 2 ]] ||
       Test::Tap:die 'Usage: test/tap.bash tests <number>'
     Test::Tap:plan "$@"
@@ -27,17 +31,17 @@ Test::Tap:init() {
 
 Test::Tap:plan() {
   Test::Tap:_check-pid
-  [ $# -eq 2 ] ||
+  [[ $# -eq 2 ]] ||
     Test::Tap:die 'Usage: plan tests <number>'
-  if [ "$1" = tests ]; then
-    [[ "$2" =~ ^-?[0-9]+$ ]] ||
+  if [[ $1 = tests ]]; then
+    [[ $2 =~ ^-?[0-9]+$ ]] ||
       Test::Tap:die 'Plan must be a number'
     [[ $2 -gt 0 ]] ||
       Test::Tap:die 'Plan must greater then 0'
     Test__Tap_plan=$2
-    printf "1..%d\n" $Test__Tap_plan
-  elif [ "$1" == skip_all ]; then
-    printf "1..0 # SKIP $2\n"
+    printf "1..%d\n" "$Test__Tap_plan"
+  elif [[ $1 == skip_all ]]; then
+    printf "1..0 # SKIP %s\n" "$2"
     exit 0
   else
     Test::Tap:die 'Usage: plan tests <number>'
@@ -46,9 +50,9 @@ Test::Tap:plan() {
 
 Test::Tap:pass() {
   Test::Tap:_check-pid
-  let Test__Tap_run=Test__Tap_run+1
-  local label="$1"
-  if [ -n "$label" ]; then
+  ((++Test__Tap_run))
+  local label=${1-}
+  if [[ $label ]]; then
     echo "ok $Test__Tap_run - $label"
   else
     echo "ok $Test__Tap_run"
@@ -58,12 +62,12 @@ Test::Tap:pass() {
 Test__Tap_CALL_STACK_LEVEL=1
 Test::Tap:fail() {
   Test::Tap:_check-pid
-  let Test__Tap_run=Test__Tap_run+1
-  local c=( $(caller $Test__Tap_CALL_STACK_LEVEL) )
-  local file=${c[2]}
-  local line=${c[0]}
-  local label="$1" callback="$2"
-  if [ -n "$label" ]; then
+  ((++Test__Tap_run))
+  IFS=' ' read -r -a c <<<"$(caller $Test__Tap_CALL_STACK_LEVEL)"
+  local file=${c[2]-}
+  local line=${c[0]-}
+  local label=${1-} callback=${2-}
+  if [[ $label ]]; then
     echo "not ok $Test__Tap_run - $label"
   else
     echo "not ok $Test__Tap_run"
@@ -72,35 +76,35 @@ Test::Tap:fail() {
   label=${label:-"at $file line $line."}
   echo -e "#   Failed test $label" >&2
 
-  [ -n "$callback" ] && $callback
+  [[ $callback ]] && $callback
 
   local rc=${TEST_TAP_BAIL_ON_FAIL:-0}
-  [[ $TEST_TAP_BAIL_ON_FAIL -eq 0 ]] || exit $rc
+  [[ $rc -eq 0 ]] || exit "$rc"
 }
 
 Test::Tap:done_testing() {
   Test::Tap:_check-pid
   Test__Tap_plan=$Test__Tap_run
-  echo 1..${1:-$Test__Tap_run}
+  echo 1.."${1:-$Test__Tap_run}"
 }
 
 Test::Tap:diag() {
   Test::Tap:_check-pid
-  local msg="$@"
+  local msg=$*
   msg="# ${msg//$'\n'/$'\n'# }"
   echo "$msg" >&2
 }
 
 Test::Tap:note() {
   Test::Tap:_check-pid
-  local msg="$@"
+  local msg=$*
   msg="# ${msg//$'\n'/$'\n'# }"
   echo "$msg"
 }
 
 Test::Tap:BAIL_OUT() {
   Test::Tap:_check-pid
-  Test__Tap_bail_msg="$@"
+  Test__Tap_bail_msg=$*
   : "${Test__Tap_bail_msg:=No reason given.}"
   exit 255
 }
@@ -113,41 +117,41 @@ Test::Tap:BAIL_ON_FAIL() {
 Test::Tap:END() {
   local rc=$?
   Test::Tap:_check-pid
-  if [ $rc -ne 0 ]; then
-    if [ -n "$Test__Tap_bail_msg" -o -n "$TEST_TAP_BAIL_ON_FAIL" ]; then
-      local bail="${Test__Tap_bail_msg:-"Bailing out on status=$rc"}"
+  if [[ $rc -ne 0 ]]; then
+    if [[ ${Test__Tap_bail_msg-} ]] ||
+       [[ ${TEST_TAP_BAIL_ON_FAIL-} ]]; then
+      local bail=${Test__Tap_bail_msg:-"Bailing out on status=$rc"}
       echo "Bail out!  $bail"
       exit $rc
     fi
   fi
 
-  for v in plan run failed; do eval local $v=\$Test__Tap_$v; done
-  if [ $plan -eq 0 ]; then
-    if [ $run -gt 0 ]; then
+  if [[ $Test__Tap_plan -eq 0 ]]; then
+    if [[ $Test__Tap_run -gt 0 ]]; then
       echo "# Tests were run but no plan was declared." >&2
     fi
   else
-    if [ $run -eq 0 ]; then
+    if [[ $Test__Tap_run -eq 0 ]]; then
       echo "# No tests run!" >&2
-    elif [ $run -ne $plan ]; then
-      local msg="# Looks like you planned $plan tests but ran $run."
-      [ $plan -eq 1 ] && msg=${msg/tests/test}
+    elif [[ $Test__Tap_run -ne $Test__Tap_plan ]]; then
+      local msg="# Looks like you planned $Test__Tap_plan tests but ran $Test__Tap_run."
+      [[ $Test__Tap_plan -eq 1 ]] && msg=${msg/tests/test}
       echo "$msg" >&2
     fi
   fi
   local exit_code=0
-  if [ $Test__Tap_failed -gt 0 ]; then
+  if [[ $Test__Tap_failed -gt 0 ]]; then
     exit_code=$Test__Tap_failed
-    [ $exit_code -gt 254 ] && exit_code=254
-    local msg="# Looks like you failed $failed tests of $run run."
-    [ $Test__Tap_failed -eq 1 ] && msg=${msg/tests/test}
+    [[ $exit_code -gt 254 ]] && exit_code=254
+    local msg="# Looks like you failed $Test__Tap_failed tests of $Test__Tap_run run."
+    [[ $Test__Tap_failed -eq 1 ]] && msg=${msg/tests/test}
     echo "$msg" >&2
   fi
   exit $exit_code
 }
 
 Test::Tap:_check-pid() {
-  if [ ${BASHPID:-0} -ne ${Test__Tap_pid:-0} ]; then
-    die "Error: Called Test::Tap method from a subprocess" 3
+  if [[ ${BASHPID:-0} -ne ${Test__Tap_pid:-0} ]]; then
+    Test::Tap:die "Error: Called Test::Tap method from a subprocess" 3
   fi
 }
diff --git a/ext/test-more-bash/ext/test-tap-bash/man/man3/test-tap.3 b/ext/test-more-bash/ext/test-tap-bash/man/man3/test-tap.3
index 9a08fe68..595fc87f 100644
--- a/ext/test-more-bash/ext/test-tap-bash/man/man3/test-tap.3
+++ b/ext/test-more-bash/ext/test-tap-bash/man/man3/test-tap.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -46,7 +46,7 @@
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
@@ -56,12 +56,12 @@
 ..
 .nr rF 0
 .if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
+.if (\n(rF:(\n(.g==0)) \{\
+.    if \nF \{\
 .        de IX
 .        tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.        if !\nF==2 \{
+.        if !\nF==2 \{\
 .            nr % 0
 .            nr F 2
 .        \}
@@ -70,8 +70,8 @@
 .rr rF
 .\" ========================================================================
 .\"
-.IX Title "Test::Tap 1"
-.TH Test::Tap 1 "January 2016" "Generated by Swim v0.1.41" "\s-1TAP\s0 Test Base for Bash"
+.IX Title "STDIN 1"
+.TH STDIN 1 "November 2020" "Generated by Swim v0.1.48" "\s-1TAP\s0 Test Base for Bash"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -114,6 +114,6 @@ Finish this doc.
 Written by Ingy döt Net <ingy@ingy.net>
 .SH "Copyright & License"
 .IX Header "Copyright & License"
-Copyright 2013\-2016. Ingy döt Net.
+Copyright 2013\-2020. Ingy döt Net.
 .PP
 The \s-1MIT\s0 License (\s-1MIT\s0).
diff --git a/ext/test-more-bash/ext/test-tap-bash/test/bail_out.t b/ext/test-more-bash/ext/test-tap-bash/test/bail_out.t
index 20ed4e02..d73617c2 100644
--- a/ext/test-more-bash/ext/test-tap-bash/test/bail_out.t
+++ b/ext/test-more-bash/ext/test-tap-bash/test/bail_out.t
@@ -5,7 +5,7 @@ source lib/test/tap.bash
 
 Test::Tap:init tests 1
 
-output=$(prove -v test/test/{b,f}ail.t 2>&1)
+output=$(prove -v test/test/{b,f}ail.t 2>&1) || true
 
 test-helper:like \
   "$output" \
diff --git a/ext/test-more-bash/ext/test-tap-bash/test/fail.t b/ext/test-more-bash/ext/test-tap-bash/test/fail.t
index fc0b9243..364853b1 100644
--- a/ext/test-more-bash/ext/test-tap-bash/test/fail.t
+++ b/ext/test-more-bash/ext/test-tap-bash/test/fail.t
@@ -5,7 +5,7 @@ source lib/test/tap.bash
 
 Test::Tap:init tests 2
 
-output="$(prove -v test/test/fail.t 2>&1)"
+output=$(prove -v test/test/fail.t 2>&1) || true
 
 # echo "# >>>${output//$'\n'/$'\n'# }<<<" >&2
 
diff --git a/ext/test-more-bash/ext/test-tap-bash/test/fail_fast.t b/ext/test-more-bash/ext/test-tap-bash/test/fail_fast.t
index 18679bf5..3e6fb05e 100644
--- a/ext/test-more-bash/ext/test-tap-bash/test/fail_fast.t
+++ b/ext/test-more-bash/ext/test-tap-bash/test/fail_fast.t
@@ -5,7 +5,7 @@ source lib/test/tap.bash
 
 Test::Tap:init tests 1
 
-output="$(prove -v test/test/fail_fast.t 2>&1)"
+output=$(prove -v test/test/fail_fast.t 2>&1) || true
 
 # echo ">>>$output<<<" >&2
 
diff --git a/ext/test-more-bash/ext/test-tap-bash/test/helper.bash b/ext/test-more-bash/ext/test-tap-bash/test/helper.bash
index 2762b27b..f272ee3f 100644
--- a/ext/test-more-bash/ext/test-tap-bash/test/helper.bash
+++ b/ext/test-more-bash/ext/test-tap-bash/test/helper.bash
@@ -1,6 +1,6 @@
 test-helper:like() {
   local got=$1 regex=$2 label=$3
-  if [[ "$got" =~ "$regex" ]]; then
+  if [[ $got =~ $regex ]]; then
     Test::Tap:pass "$label"
   else
     Test::Tap:fail "$label"
diff --git a/ext/test-more-bash/ext/test-tap-bash/test/shellcheck.t b/ext/test-more-bash/ext/test-tap-bash/test/shellcheck.t
new file mode 100644
index 00000000..3efda399
--- /dev/null
+++ b/ext/test-more-bash/ext/test-tap-bash/test/shellcheck.t
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+
+source lib/test/tap.bash
+
+if ! command -v shellcheck >/dev/null; then
+  Test::Tap:init skip_all "The 'shellcheck' utility is not installed"
+fi
+if [[ ! $(shellcheck --version) =~ 0\.7\.1 ]]; then
+  Test::Tap:init skip_all "This test wants shellcheck version 0.7.1"
+fi
+
+Test::Tap:init
+
+IFS=$'\n' read -d '' -r -a shell_files <<< "$(
+  find lib -type f
+  echo test/helper.bash
+  find test -name '*.t'
+)" || true
+
+skips=(
+  # We want to keep these 2 here always:
+  SC1090  # Can't follow non-constant source. Use a directive to specify location.
+  SC1091  # Not following: bash+ was not specified as input (see shellcheck -x).
+)
+
+skip=$(IFS=,; echo "${skips[*]}")
+
+for file in "${shell_files[@]}"; do
+  [[ $file == *swp ]] && continue
+  label="The shell file '$file' passes shellcheck"
+  got=$(shellcheck -e "$skip" "$file" 2>&1) || true
+  if [[ -z $got ]]; then
+    Test::Tap:pass "$label"
+  else
+    Test::Tap:fail "$label"
+    Test::Tap:diag "$got"
+  fi
+done
+
+Test::Tap:done_testing
+
+# vim: set ft=sh:
diff --git a/ext/test-more-bash/ext/test-tap-bash/test/tap.t b/ext/test-more-bash/ext/test-tap-bash/test/tap.t
index 88bcd189..610937fd 100644
--- a/ext/test-more-bash/ext/test-tap-bash/test/tap.t
+++ b/ext/test-more-bash/ext/test-tap-bash/test/tap.t
@@ -2,12 +2,18 @@
 
 source lib/test/tap.bash
 
-Test::Tap:init tests 4
+Test::Tap:init tests 3 # 4
 
 Test::Tap:pass 'pass with label'
 Test::Tap:pass
 Test::Tap:pass 'previous test has no label'
-msg="$(Test::Tap:fail 'faaaaailll' 2>/dev/null)"
-if [[ "$msg" =~ not\ ok\ 4\ -\ faaaaailll ]]; then
-  Test::Tap:pass 'fail works'
-fi
+
+# TODO this test no longer working:
+# msg=$(Test::Tap:fail 'faaaaailll' 2>/dev/null) || true
+#
+# if [[ $msg =~ not\ ok\ 4\ -\ faaaaailll ]]; then
+#   Test::Tap:pass 'fail works'
+# else
+#   Test::Tap:fail 'fail works'
+#   Test::Tap:diag "$msg"
+# fi
diff --git a/ext/test-more-bash/lib/test/more.bash b/ext/test-more-bash/lib/test/more.bash
index 84d1fdb1..6fa9f56d 100644
--- a/ext/test-more-bash/lib/test/more.bash
+++ b/ext/test-more-bash/lib/test/more.bash
@@ -1,12 +1,17 @@
 # test/more.bash - Complete TAP test framework for Bash
 #
-# Copyright (c) 2013-2016. Ingy döt Net.
+# Copyright (c) 2013-2020. Ingy döt Net.
 
-set -e
+set -e -u -o pipefail
 
-Test__More_VERSION=0.0.3
+# shellcheck disable=2034
+Test__More_VERSION=0.0.5
+
+source bash+ :std version-check
+
+version-check bash 3.2 ||
+  die "test-more-bash requires bash 3.2+"
 
-source bash+ :std
 use Test::Tap
 
 Test::More:import() { Test::Tap:init "$@"; }
@@ -21,7 +26,7 @@ BAIL_OUT() { Test::Tap:BAIL_OUT "$@"; }
 BAIL_ON_FAIL() { Test::Tap:BAIL_ON_FAIL "$@"; }
 
 is() {
-  local got="$1" want="$2" label="$3"
+  local got=$1 want=$2 label=${3-}
   if [[ $got == "$want" ]]; then
     Test::Tap:pass "$label"
   else
@@ -32,10 +37,10 @@ is() {
 Test::More:is-fail() {
   local Test__Tap_CALL_STACK_LEVEL=
   Test__Tap_CALL_STACK_LEVEL=$(( Test__Tap_CALL_STACK_LEVEL + 1 ))
-  if [[ "$want" =~ \n ]]; then
+  if [[ $want =~ $'\n' ]]; then
     echo "$got" > /tmp/got-$$
     echo "$want" > /tmp/want-$$
-    diff -u /tmp/{want,got}-$$ >&2
+    diff -u /tmp/{want,got}-$$ >&2 || true
     wc /tmp/{want,got}-$$ >&2
     rm -f /tmp/{got,want}-$$
   else
@@ -48,7 +53,7 @@ Test::More:is-fail() {
 isnt() {
   local Test__Tap_CALL_STACK_LEVEL=
   Test__Tap_CALL_STACK_LEVEL=$(( Test__Tap_CALL_STACK_LEVEL + 1 ))
-  local got="$1" dontwant="$2" label="$3"
+  local got=$1 dontwant=$2 label=${3-}
   if [[ $got != "$dontwant" ]]; then
     Test::Tap:pass "$label"
   else
@@ -63,14 +68,16 @@ Test::More:isnt-fail() {
 }
 
 ok() {
-  (exit ${1:-$?}) &&
-    Test::Tap:pass "$2" ||
-    Test::Tap:fail "$2"
+  if (exit "${1:-$?}"); then
+    Test::Tap:pass "${2-}"
+  else
+    Test::Tap:fail "${2-}"
+  fi
 }
 
 like() {
-  local got=$1 regex=$2 label=$3
-  if [[ $got =~ "$regex" ]]; then
+  local got=$1 regex=$2 label=${3-}
+  if [[ $got =~ $regex ]]; then
     Test::Tap:pass "$label"
   else
     Test::Tap:fail "$label" Test::More:like-fail
@@ -82,8 +89,8 @@ Test::More:like-fail() {
 }
 
 unlike() {
-  local got=$1 regex=$2 label=$3
-  if [[ ! $got =~ "$regex" ]]; then
+  local got=$1 regex=$2 label=${3-}
+  if [[ ! $got =~ $regex ]]; then
     Test::Tap:pass "$label"
   else
     Test::Tap:fail "$label" Test::More:unlike-fail
@@ -93,3 +100,16 @@ unlike() {
 Test::More:unlike-fail() {
     Test::Tap:diag "Got: '$got'"
 }
+
+cmp-array() {
+    local arrayname="$1[@]"
+    local expname="$2[@]"
+    local label=${3-}
+
+    local array=("${!arrayname}")
+    local expected=("${!expname}")
+
+    is "$(printf "%s\n" "${array[@]}")" \
+      "$(printf "%s\n" "${expected[@]}")" \
+      "$label"
+}
diff --git a/ext/test-more-bash/man/man3/test-more.3 b/ext/test-more-bash/man/man3/test-more.3
index c72f1cbd..b548d961 100644
--- a/ext/test-more-bash/man/man3/test-more.3
+++ b/ext/test-more-bash/man/man3/test-more.3
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -46,7 +46,7 @@
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
@@ -56,12 +56,12 @@
 ..
 .nr rF 0
 .if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
+.if (\n(rF:(\n(.g==0)) \{\
+.    if \nF \{\
 .        de IX
 .        tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.        if !\nF==2 \{
+.        if !\nF==2 \{\
 .            nr % 0
 .            nr F 2
 .        \}
@@ -70,8 +70,8 @@
 .rr rF
 .\" ========================================================================
 .\"
-.IX Title "Test::More 1"
-.TH Test::More 1 "January 2016" "Generated by Swim v0.1.41" "\s-1TAP\s0 Testing for Bash"
+.IX Title "STDIN 1"
+.TH STDIN 1 "November 2020" "Generated by Swim v0.1.48" "\s-1TAP\s0 Testing for Bash"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -120,6 +120,10 @@ Write a test file like this. Maybe call it \f(CW\*(C`test/test.t\*(C'\fR:
 \&    diag "A message for stderr"
 \&
 \&    note "A message for stdout"
+\&
+\&    output=( $(ls) )
+\&    expected=(README lib bin)
+\&    cmp\-array output expected "list files"
 .Ve
 .PP
 Run the test with \f(CW\*(C`prove\*(C'\fR like this:
@@ -131,7 +135,7 @@ Run the test with \f(CW\*(C`prove\*(C'\fR like this:
 Prove knows it's Bash from the first line (the hashbang), and it just works.
 .SH "Description"
 .IX Header "Description"
-Test::More is the tried and true testing library for Perl. It uses \s-1TAP \s0(the Test Anything Protocol). This is the same thing for Bash.  For the most part it should work exactly the same.
+Test::More is the tried and true testing library for Perl. It uses \s-1TAP\s0 (the Test Anything Protocol). This is the same thing for Bash.  For the most part it should work exactly the same.
 .SH "Methods"
 .IX Header "Methods"
 This is the basic usage:
@@ -161,13 +165,15 @@ This is the basic usage:
 \&\f(CW\*(C`plan skip_all "$reason"\*(C'\fR
 .IP "\(bu" 4
 \&\f(CW\*(C`BAIL_OUT "$reason"\*(C'\fR
+.IP "\(bu" 4
+`cmp\-array output expected \*(L"message\*(R"
 .PP
 More detailed info coming soon.
 .SH "Author"
 .IX Header "Author"
-Ingy döt Net <ingy@bpan.org>
+Ingy döt Net <ingy@ingy.net>
 .SH "Copyright & License"
 .IX Header "Copyright & License"
-Copyright 2013\-2016. Ingy döt Net.
+Copyright 2013\-2020. Ingy döt Net.
 .PP
 The \s-1MIT\s0 License (\s-1MIT\s0)
diff --git a/ext/test-more-bash/test/fail.t b/ext/test-more-bash/test/fail.t
index 2d5ac30f..4d8ea796 100644
--- a/ext/test-more-bash/test/fail.t
+++ b/ext/test-more-bash/test/fail.t
@@ -12,9 +12,23 @@ like "$output" 'not ok 2' \
   'fail with no label'
 like "$output" 'not ok 3 - is foo bar' \
   'fail output is correct'
+like "$output" 'not ok 4 - command output more' \
+  'fail output is correct'
+like "$output" 'not ok 5 - command output less' \
+  'fail output is correct'
+like "$output" 'not ok 6 - command output diff' \
+  'fail output is correct'
 like "$output" "#     got: 'foo'" \
   'difference reporting - got'
 like "$output" "#   expected: 'bar'" \
   'difference reporting - want'
 
-done_testing 5
+like "$output" "line2. *\+line3." \
+  'array comparison (more)'
+like "$output" "line1. *-line2." \
+  'array comparison (less)'
+like "$output" "-line2.*\+foo" \
+  'array comparison (diff)'
+
+
+done_testing 11
diff --git a/ext/test-more-bash/test/more.t b/ext/test-more-bash/test/more.t
index 95878b71..27528380 100644
--- a/ext/test-more-bash/test/more.t
+++ b/ext/test-more-bash/test/more.t
@@ -1,20 +1,28 @@
 #!/usr/bin/env bash
 
+# shellcheck disable=2034
+
 source test/setup
 use Test::More
 
-plan tests 5
+plan tests 6
 
 pass 'This test always passes'
 
 is 'foo' "foo" 'foo is foo'
 
-ok "`true`" 'true is true'
+ok "$(true)" 'true is true'
 
-ok "`[ 123 -eq $((61+62)) ]`" 'Math works'
+ok "$([ 123 -eq "$((61+62))" ])" 'Math works'
 
-ok "`[[ ! team =~ I ]]`" "There's no I in team"
+# shellcheck disable=2050
+ok "$([[ ! team =~ I ]])" "There's no I in team"
 
 # diag "A msg for stderr"
 
 note "A msg for stdout"
+
+expected=(line1 line2)
+
+command_output=(line1 line2 )
+cmp-array command_output expected "command output more"
diff --git a/ext/test-more-bash/test/setup b/ext/test-more-bash/test/setup
old mode 100644
new mode 100755
index 1c618959..99df35d6
--- a/ext/test-more-bash/test/setup
+++ b/ext/test-more-bash/test/setup
@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
-set -e
+set -e -u -o pipefail
 
-BASHLIB="`find $PWD -type d | grep -E '/(bin|lib)$' | xargs -n1 printf "%s:"`"
-PATH="$BASHLIB:$PATH"
+BASHLIB=$(find "$PWD" -type d | grep -E '/(bin|lib)$' | xargs -n1 printf "%s:")
+PATH=$BASHLIB:$PATH
 
 source bash+ :std
diff --git a/ext/test-more-bash/test/shellcheck.t b/ext/test-more-bash/test/shellcheck.t
new file mode 100644
index 00000000..a496d6fe
--- /dev/null
+++ b/ext/test-more-bash/test/shellcheck.t
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+source test/setup
+use Test::More
+
+if ! command -v shellcheck >/dev/null; then
+  plan skip_all "The 'shellcheck' utility is not installed"
+fi
+if [[ ! $(shellcheck --version) =~ 0\.7\.1 ]]; then
+  plan skip_all "This test wants shellcheck version 0.7.1"
+fi
+
+IFS=$'\n' read -d '' -r -a shell_files <<< "$(
+  find lib -type f
+  echo test/setup
+  find test -name '*.t'
+)" || true
+
+skips=(
+  # We want to keep these 2 here always:
+  SC1090  # Can't follow non-constant source. Use a directive to specify location.
+  SC1091  # Not following: bash+ was not specified as input (see shellcheck -x).
+)
+
+skip=$(IFS=,; echo "${skips[*]}")
+
+for file in "${shell_files[@]}"; do
+  [[ $file == *swp ]] && continue
+  is "$(shellcheck -e "$skip" "$file")" "" \
+    "The shell file '$file' passes shellcheck"
+done
+
+done_testing
+
+# vim: set ft=sh:
diff --git a/ext/test-more-bash/test/test/fail1.t b/ext/test-more-bash/test/test/fail1.t
index 4a4c25fe..4e702f04 100644
--- a/ext/test-more-bash/test/test/fail1.t
+++ b/ext/test-more-bash/test/test/fail1.t
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+# shellcheck disable=2034
+
 source test/setup
 use Test::More
 
@@ -9,4 +11,15 @@ fail
 
 is foo bar 'is foo bar'
 
-done_testing 3
+expected=(line1 line2)
+
+command_output=(line1 line2 line3)
+cmp-array command_output expected "command output more"
+
+command_output=(line1)
+cmp-array command_output expected "command output less"
+
+command_output=(line1 foo)
+cmp-array command_output expected "command output diff"
+
+done_testing 6
diff --git a/lib/git-subrepo b/lib/git-subrepo
index 68918cbe..dfd12017 100755
--- a/lib/git-subrepo
+++ b/lib/git-subrepo
@@ -1,34 +1,39 @@
 #!/usr/bin/env bash
 #
 #
-# Copyright 2013-2017 - Ingy döt Net <ingy@ingy.net>
+# Copyright 2013-2020 - Ingy döt Net <ingy@ingy.net>
 #
 
+# shellcheck disable=1090,1091,2034
 
 # Exit on any errors:
 set -e
 
+export FILTER_BRANCH_SQUELCH_WARNING=1
+
 # Import Bash+ helper functions:
-SOURCE="$BASH_SOURCE"
+SOURCE=${BASH_SOURCE[0]}
 while [[ -h $SOURCE ]]; do
-  DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
-  SOURCE="$(readlink "$SOURCE")"
-  [[ $SOURCE != /* ]] && SOURCE="$DIR/$SOURCE"
+  DIR=$( cd -P "$( dirname "$SOURCE" )" && pwd )
+  SOURCE=$(readlink "$SOURCE")
+  [[ $SOURCE != /* ]] && SOURCE=$DIR/$SOURCE
 done
-SOURCE_DIR="$(dirname "$SOURCE")"
+SOURCE_DIR=$(dirname "$SOURCE")
 
-if [[ -z "$GIT_SUBREPO_ROOT" ]]; then
+if [[ -z $GIT_SUBREPO_ROOT ]]; then
   # If `make install` installation used:
   source "${SOURCE_DIR}/git-subrepo.d/bash+.bash"
 else
   # If `source .rc` method used:
   source "${SOURCE_DIR}/../ext/bashplus/lib/bash+.bash"
 fi
-bash+:import :std can
+bash+:import :std can version-check
+
 
-VERSION=0.4.0
-REQUIRED_GIT_VERSION=2.7.0
-GIT_TMP=.git/tmp
+VERSION=0.4.9
+REQUIRED_BASH_VERSION=4.0
+REQUIRED_GIT_VERSION=2.23.0
+GIT_TMP=$(git rev-parse --git-common-dir 2> /dev/null || echo .git)/tmp
 
 # `git rev-parse` turns this into a getopt parser and a command usage message:
 GETOPT_SPEC="\
@@ -66,9 +71,9 @@ b,branch=   Specify the upstream branch to push/pull/fetch
 e,edit      Edit commit message
 f,force     Force certain operations
 F,fetch     Fetch the upstream content first
-M,method=   Method when you join, valid options are 'merge' or 'rebase'
-            Default is 'merge'
+M,method=   Join method: 'merge' (default) or 'rebase'
 m,message=  Specify a commit message
+file=       Specify a commit message file
 r,remote=   Specify the upstream remote to push/pull/fetch
 s,squash    Squash commits on push
 u,update    Add the --branch and/or --remote overrides to .gitrepo
@@ -104,7 +109,8 @@ main() {
   local subref=                 # Valid git ref format of subdir
   local gitrepo=                # Path to .gitrepo file
   local worktree=               # Worktree created by 'git worktree'
-  local start_pwd=$(pwd)        # Store the original directory
+  local start_pwd
+        start_pwd=$(pwd)        # Store the original directory
 
   local original_head_commit=   # HEAD commit id at start of command
   local original_head_branch=   # HEAD ref at start of command
@@ -126,6 +132,7 @@ main() {
 
   local edit_wanted=false       # Edit commit message using -e
   local wanted_commit_message=  # Custom commit message using -m
+  local commit_msg_file=        # Custom commit message using --file
 
   local join_method=            # Current join method (rebase/merge)
 
@@ -152,10 +159,14 @@ main() {
   command-init
 
   if $all_wanted && [[ ! $command =~ ^(help|status)$ ]]; then
+    if [[ -n $subrepo_branch ]]; then
+      error "options --branch and --all are not compatible"
+    fi
+
     # Run the command on all subrepos
     local args=( "${command_arguments[@]}" )
     get-all-subrepos
-    for subdir in ${subrepos[*]}; do
+    for subdir in "${subrepos[@]}"; do
       command-prepare
       subrepo_remote=
       subrepo_branch=
@@ -193,15 +204,28 @@ command:clone() {
   # Successful command output:
   local re=
   $force_wanted && re=re
-  local remote="$subrepo_remote"
+  local remote=$subrepo_remote
   say "Subrepo '$remote' ($subrepo_branch) ${re}cloned into '$subdir'."
 }
 
 # `git subrepo init <subdir>` command:
 command:init() {
   command-setup +subdir
-  local remote="${subrepo_remote:=none}"
-  local branch="${subrepo_branch:=master}"
+  local default_branch=
+  # Check if Git supports init.defaultbranch (Git 2.28+)
+  local git_version
+  local git_major
+  local git_minor
+  git_version=$(git --version | sed 's/git version //' | sed 's/\..*//')
+  git_major=$(echo "$git_version" | cut -d. -f1)
+  git_minor=$(echo "$git_version" | cut -d. -f2)
+  if [[ $git_major -gt 2 ]] || [[ $git_major -eq 2 && $git_minor -ge 28 ]]; then
+    default_branch=$(git config --get init.defaultbranch 2>/dev/null || echo "master")
+  else
+    default_branch="master"
+  fi
+  local remote=${subrepo_remote:=none}
+  local branch=${subrepo_branch:=$default_branch}
 
   # Init new subrepo from the subdir:
   subrepo:init
@@ -257,7 +281,7 @@ command:push() {
 # `git subrepo fetch <subdir>` command
 command:fetch() {
   command-setup +subdir
-  if [[ $subrepo_remote == "none" ]]; then
+  if [[ $subrepo_remote == none ]]; then
     say "Ignored '$subdir', no remote."
   else
     subrepo:fetch
@@ -272,10 +296,10 @@ command:branch() {
     CALL subrepo:fetch
   fi
 
-  local branch="subrepo/$subref"
+  local branch=subrepo/$subref
   if $force_wanted; then
     # We must make sure that the worktree is removed as well
-    worktree="$GIT_TMP/$branch"
+    worktree=$GIT_TMP/$branch
     git:delete-branch "$branch"
   fi
 
@@ -298,10 +322,10 @@ command:commit() {
   fi
   git:rev-exists "$refs_subrepo_fetch" ||
     error "Can't find ref '$refs_subrepo_fetch'. Try using -F."
-  upstream_head_commit="$(git rev-parse "$refs_subrepo_fetch")"
+  upstream_head_commit=$(git rev-parse "$refs_subrepo_fetch")
 
-  [[ -n $subrepo_commit_ref ]] ||
-    subrepo_commit_ref="subrepo/$subref"
+  [[ ${subrepo_commit_ref-} ]] ||
+    subrepo_commit_ref=subrepo/$subref
   subrepo:commit
 
   say "Subrepo commit '$subrepo_commit_ref' committed as"
@@ -315,11 +339,11 @@ command:status() {
 
 status-refs() {
   local output=
-  while read line; do
+  while read -r line; do
     [[ $line =~ ^([0-9a-f]+)\ refs/subrepo/$subref/([a-z]+) ]] || continue
-    local sha1=; sha1="$(git rev-parse --short "${BASH_REMATCH[1]}")"
-    local type="${BASH_REMATCH[2]}"
-    local ref="refs/subrepo/$subref/$type"
+    local sha1=; sha1=$(git rev-parse --short "${BASH_REMATCH[1]}")
+    local type=${BASH_REMATCH[2]}
+    local ref=refs/subrepo/$subref/$type
     if [[ $type == branch ]]; then
       output+="    Branch Ref:    $sha1 ($ref)"$'\n'
     elif [[ $type == commit ]]; then
@@ -332,8 +356,8 @@ status-refs() {
       output+="    Push Ref:      $sha1 ($ref)"$'\n'
     fi
   done < <(git show-ref)
-  if [[ -n $output ]]; then
-    printf "  Refs:\n$output"
+  if [[ $output ]]; then
+    printf "  Refs:\n%s" "$output"
   fi
 }
 
@@ -350,13 +374,14 @@ command:clean() {
 # Wrap git config $gitrepo
 command:config() {
   command-setup +subdir +config_option config_value
-  o "Update '$subdir' configuration with $config_option=$config_value"
+  # shellcheck disable=2154
+  o "Update '$subdir' configuration with $config_option=${config_value-}"
 
   if [[ ! $config_option =~ ^(branch|cmdver|commit|method|remote|version)$ ]]; then
     error "Option $config_option not recognized"
   fi
 
-  if [[ -z $config_value ]]; then
+  if [[ -z ${config_value-} ]]; then
     OUT=true RUN git config --file="$gitrepo" "subrepo.$config_option"
     say "Subrepo '$subdir' option '$config_option' has value '$output'."
     return
@@ -364,12 +389,12 @@ command:config() {
 
   if ! $force_wanted; then
     # Only allow changing method without force
-    if [[ ! $config_option == "method" ]]; then
+    if [[ $config_option != method ]]; then
       error "This option is autogenerated, use '--force' to override."
     fi
   fi
 
-  if [[ $config_option == "method" ]]; then
+  if [[ $config_option == method ]]; then
     if [[ ! $config_value =~ ^(merge|rebase)$ ]]; then
       error "Not a valid method. Valid options are 'merge' or 'rebase'."
     fi
@@ -383,8 +408,8 @@ command:config() {
 # Launch the manpage viewer:
 command:help() {
   source "${SOURCE_DIR}/git-subrepo.d/help-functions.bash"
-  local cmd="${command_arguments[0]}"
-  if [[ -n $cmd ]]; then
+  local cmd=${command_arguments[0]}
+  if [[ $cmd ]]; then
     if can "help:$cmd"; then
       "help:$cmd"
       echo
@@ -405,9 +430,9 @@ command:help() {
 command:version() {
   cat <<...
 git-subrepo Version: $VERSION
-Copyright 2013-2017 Ingy döt Net
-https://github.com/git-commands/git-subrepo
-$BASH_SOURCE
+Copyright 2013-2020 Ingy döt Net
+https://github.com/ingydotnet/git-subrepo
+${BASH_SOURCE[0]}
 Git Version: $git_version
 
 ...
@@ -415,15 +440,15 @@ Git Version: $git_version
 }
 
 command:upgrade() {
-  local path="$0"
+  local path=$0
   if [[ $path =~ ^/ && $path =~ ^(.*/git-subrepo)/lib/git-subrepo$ ]]; then
-    local subrepo_root="${BASH_REMATCH[1]}"
+    local subrepo_root=${BASH_REMATCH[1]}
     (
       o "Change directory to '$subrepo_root'."
       cd "${BASH_REMATCH[1]}"
 
-      local branch="$(git rev-parse --abbrev-ref HEAD)"
-      if [[ $branch != master ]]; then
+      branch_name=$(git rev-parse --abbrev-ref HEAD)
+      if [[ $branch_name != master ]]; then
         error "git-subrepo repo is not on the 'master' branch"
       fi
 
@@ -455,8 +480,6 @@ If you used 'make install' to install git-subrepo, then just do this:
 
 # Clone by fetching remote content into our subdir:
 subrepo:clone() {
-  re="$1"
-
   FAIL=false RUN git rev-parse HEAD
   if ! OK; then
     error "You can't clone into an empty repository"
@@ -472,18 +495,25 @@ subrepo:clone() {
     CALL subrepo:fetch
     read-gitrepo-file
     o "Check if we already are up to date."
-    if [[ $upstream_head_commit == $subrepo_commit ]]; then
+    if [[ $upstream_head_commit == "$subrepo_commit" ]]; then
       reclone_up_to_date=true
       return
     fi
     o "Remove the old subdir."
     RUN git rm -r -- "$subdir"
+
+    if [[ -z $override_branch ]]; then
+      o "Determine the upstream head branch."
+      get-upstream-head-branch
+      subrepo_branch="$output"
+      override_branch="$output" # Force update of the branch in .gitrepo
+    fi
   else
     assert-subdir-empty
     if [[ -z $subrepo_branch ]]; then
       o "Determine the upstream head branch."
       get-upstream-head-branch
-      subrepo_branch="$output"
+      subrepo_branch=$output
     fi
 
     CALL subrepo:fetch
@@ -493,13 +523,13 @@ subrepo:clone() {
   RUN mkdir -p -- "$subdir"
 
   o "Commit the new '$subdir/' content."
-  subrepo_commit_ref="$upstream_head_commit"
+  subrepo_commit_ref=$upstream_head_commit
   CALL subrepo:commit
 }
 
 # Init a new subrepo from current repo:
 subrepo:init() {
-  local branch_name="subrepo/${subref:??}"
+  local branch_name=subrepo/${subref:??}
   # Check if subdir is proper candidate for this init:
   assert-subdir-ready-for-init
 
@@ -511,7 +541,7 @@ subrepo:init() {
   RUN git add -f -- "$gitrepo"
 
   o "Commit new subrepo to the '$original_head_branch' branch."
-  subrepo_commit_ref="$original_head_commit"
+  subrepo_commit_ref=$original_head_commit
   RUN git commit -m "$(get-commit-message)"
 
   o "Create ref '$refs_subrepo_commit'."
@@ -522,22 +552,28 @@ subrepo:init() {
 subrepo:pull() {
   CALL subrepo:fetch
 
+  # If forced pull, then clone instead
+  if $force_wanted; then
+    CALL subrepo:clone
+    return
+  fi
+
   # Check if we already are up to date
   # If the -u flag is present, always perform the operation
-  if [[ $upstream_head_commit == $subrepo_commit ]] && ! $update_wanted; then
+  if [[ $upstream_head_commit == "$subrepo_commit" ]] && ! $update_wanted; then
     OK=false; CODE=-1; return
   fi
 
-  local branch_name="subrepo/$subref"
+  local branch_name=subrepo/$subref
   git:delete-branch "$branch_name"
 
-  subrepo_commit_ref="$branch_name"
+  subrepo_commit_ref=$branch_name
 
   o "Create subrepo branch '$branch_name'."
   CALL subrepo:branch
   cd "$worktree";
 
-  if [[ "$join_method" == "rebase" ]]; then
+  if [[ $join_method == rebase ]]; then
     o "Rebase changes to $refs_subrepo_fetch"
     FAIL=false OUT=true RUN git rebase "$refs_subrepo_fetch" "$branch_name"
     if ! OK; then
@@ -549,7 +585,7 @@ subrepo:pull() {
     fi
   else
     o "Merge in changes from $refs_subrepo_fetch"
-    FAIL=false OUT=true RUN git merge "$refs_subrepo_fetch"
+    FAIL=false RUN git merge "$refs_subrepo_fetch"
     if ! OK; then
       say "The \"git merge\" command failed:"
       say
@@ -571,7 +607,7 @@ subrepo:pull() {
 
 # Push a properly merged subrepo branch upstream:
 subrepo:push() {
-  local branch_name="$branch"
+  local branch_name=$branch
   local new_upstream=false
   local branch_created=false
 
@@ -581,8 +617,9 @@ subrepo:push() {
     if ! OK; then
       # Check if we are pushing to a new upstream repo (or branch) and just
       # push the commit directly. This is common after a `git subrepo init`:
-      local re="(^|"$'\n'")fatal: Couldn't find remote ref "
-      if [[ $output =~ $re ]]; then
+      # Force to case in
+      local re="(^|"$'\n'")fatal: couldn't find remote ref "
+      if [[ ${output,,} =~ $re ]]; then
         o "Pushing to new upstream: $subrepo_remote ($subrepo_branch)."
         new_upstream=true
       else
@@ -592,25 +629,27 @@ subrepo:push() {
       # Check that we are up to date:
       o "Check upstream head against .gitrepo commit."
       if ! $force_wanted; then
-        if [[ $upstream_head_commit != $subrepo_commit ]]; then
+        if [[ $upstream_head_commit != "$subrepo_commit" ]]; then
           error "There are new changes upstream, you need to pull first."
         fi
       fi
     fi
 
-    branch_name="subrepo/$subref"
+    branch_name=subrepo/$subref
+    # We must make sure that a stale worktree is removed as well
+    worktree=$GIT_TMP/$branch_name
     git:delete-branch "$branch_name"
 
     if $squash_wanted; then
       o "Squash commits"
-      subrepo_parent="HEAD^"
+      subrepo_parent=HEAD^
     fi
 
     o "Create subrepo branch '$branch_name'."
     CALL subrepo:branch "$branch_name"
     cd "$worktree";
 
-    if [[ "$join_method" == "rebase" ]]; then
+    if [[ $join_method == rebase ]]; then
       o "Rebase changes to $refs_subrepo_fetch"
       FAIL=false OUT=true RUN git rebase "$refs_subrepo_fetch" "$branch_name"
       if ! OK; then
@@ -634,9 +673,13 @@ subrepo:push() {
     error "No subrepo branch '$branch_name' to push."
 
   o "Check if we have something to push"
-  new_upstream_head_commit="$(git rev-parse "$branch_name")"
+  new_upstream_head_commit=$(git rev-parse "$branch_name")
   if ! $new_upstream; then
-    if [[ $upstream_head_commit == $new_upstream_head_commit ]]; then
+    if [[ $upstream_head_commit == "$new_upstream_head_commit" ]]; then
+      if $branch_created; then
+        o "Remove branch '$branch_name'."
+        git:delete-branch "$branch_name"
+      fi
       OK=false
       CODE=-2
       return
@@ -655,6 +698,7 @@ subrepo:push() {
   "$force_wanted" && force=' --force'
 
   o "Push$force branch '$branch_name' to '$subrepo_remote' ($subrepo_branch)."
+  # shellcheck disable=2086
   RUN git push$force "$subrepo_remote" "$branch_name":"$subrepo_branch"
 
   o "Create ref '$refs_subrepo_push' for branch '$branch_name'."
@@ -666,10 +710,22 @@ subrepo:push() {
   fi
 
   o "Put updates into '$subdir/.gitrepo' file."
-  upstream_head_commit="$new_upstream_head_commit"
-  subrepo_commit_ref="$upstream_head_commit"
+  upstream_head_commit=$new_upstream_head_commit
+  subrepo_commit_ref=$upstream_head_commit
   update-gitrepo-file
-  RUN git commit -m "$(get-commit-message)"
+
+  local commit_message
+  if [[ $wanted_commit_message ]]; then
+    commit_message=$wanted_commit_message
+  else
+    commit_message=$(get-commit-message)
+  fi
+
+  if [[ $commit_msg_file ]]; then
+    RUN git command --file "$commit_msg_file"
+  else
+    RUN git commit -m "$commit_message"
+  fi
 }
 
 # Fetch the subrepo's remote branch content:
@@ -684,15 +740,16 @@ subrepo:fetch() {
 
   o "Get the upstream subrepo HEAD commit."
   OUT=true RUN git rev-parse FETCH_HEAD^0
-  upstream_head_commit="$output"
+  upstream_head_commit=$output
 
   o "Create ref '$refs_subrepo_fetch'."
   git:make-ref "$refs_subrepo_fetch" FETCH_HEAD^0
 }
 
 # Create a subrepo branch containing all changes
+# shellcheck disable=2120
 subrepo:branch() {
-  local branch="${1:-"subrepo/$subref"}"
+  local branch=${1:-"subrepo/$subref"}
   o "Check if the '$branch' branch already exists."
   git:branch-exists "$branch" && return
 
@@ -700,71 +757,97 @@ subrepo:branch() {
   local first_gitrepo_commit=
 
   o "Subrepo parent: $subrepo_parent"
-  if [[ -n "$subrepo_parent" ]]; then
+
+  if [[ $subrepo_parent ]]; then
+
+    # Check if the subrepo parent is an ancestor of HEAD.
+    # For example rebasing the commit that touched the subrepo
+    # could make the commit no longer match.
+    local parent_is_ancestor=
+    git merge-base --is-ancestor "$subrepo_parent" HEAD && parent_is_ancestor="true"
+    if [[ -z "$parent_is_ancestor" ]]; then
+      local prev_merge_point
+      prev_merge_point=$(git log -1 -G "commit =" --format="%H" "$gitrepo")
+        # We want the SHA of the patch before the sync point just in case someone made a modifcation in the
+        # actual sync commit
+        prev_merge_point=$(git log -1 --format="%H" "$prev_merge_point"^)
+        error "The last sync point (where upstream and the subrepo were equal) is not an ancestor. \n \
+            This is usually caused by a rebase affecting that commit. \n \
+            To recover set the subrepo parent in '$gitrepo'\n \
+            to '$prev_merge_point' \n \
+            and validate the subrepo by comparing with 'git subrepo branch $subdir'"
+    fi
+
     local prev_commit=
     local ancestor=
     o "Create new commits with parents into the subrepo fetch"
-    OUT=true RUN git rev-list --reverse --ancestry-path "$subrepo_parent..HEAD"
-    local commit_list="$output"
+    OUT=true RUN git rev-list --reverse --ancestry-path --topo-order "$subrepo_parent..HEAD"
+    local commit_list=$output
     for commit in $commit_list; do
       o "Working on $commit"
 
       FAIL=false OUT=true RUN git config --blob \
-        "$commit":"$subdir/.gitrepo" "subrepo.commit"
-      if [[ -z "$output" ]]; then
+        "$commit:$subdir/.gitrepo" "subrepo.commit"
+      if [[ -z $output ]]; then
         o "Ignore commit, no .gitrepo file"
         continue
       fi
 
-      local gitrepo_commit="$output"
+      local gitrepo_commit=$output
       o ".gitrepo reference commit: $gitrepo_commit"
 
 
       # Only include the commit if it's a child of the previous commit
       # This way we create a single path between $subrepo_parent..HEAD
-      if [[ -n "$ancestor" ]]; then
-        local is_direct_child=$(git show -s --pretty=format:"%P" $commit | grep "$ancestor")
+      if [[ $ancestor ]]; then
+        local is_direct_child
+        is_direct_child=$(
+          git show -s --pretty=format:"%P" "$commit" |
+            grep "$ancestor"
+        ) || true
         o "is child: $is_direct_child"
-        if [[ -z "$is_direct_child" ]]; then
+        if [[ -z $is_direct_child ]]; then
           o "Ignore $commit, it's not in the selected path"
           continue
         fi
       fi
 
       # Remember the previous commit from the parent repo path
-      ancestor="$commit"
+      ancestor=$commit
 
       o "Check for rebase"
       if git:rev-exists "$refs_subrepo_fetch"; then
         if ! git:commit-in-rev-list  "$gitrepo_commit" "$refs_subrepo_fetch"; then
-          error "Local repository does not contain $gitrepo_commit. Try to 'git subrepo fetch $subref' of add the '-F' flag to always fetch the latest content."
+          error "Local repository does not contain $gitrepo_commit. Try to 'git subrepo fetch $subref' or add the '-F' flag to always fetch the latest content."
         fi
       fi
 
       o "Find parents"
-      local first_parent=
-      [[ -n $prev_commit ]] && first_parent="-p $prev_commit"
-      local second_parent=
-      if [[ -z "$first_gitrepo_commit" ]]; then
-        first_gitrepo_commit="$gitrepo_commit"
-        second_parent="-p $gitrepo_commit"
+      local first_parent second_parent
+      first_parent=()
+      [[ $prev_commit ]] && first_parent=(-p "$prev_commit")
+      second_parent=()
+      if [[ -z $first_gitrepo_commit ]]; then
+        first_gitrepo_commit=$gitrepo_commit
+        second_parent=(-p "$gitrepo_commit")
       fi
 
-      if [[ "$join_method" != "rebase" ]]; then
+      if [[ $join_method != rebase ]]; then
         # In the rebase case we don't create merge commits
-        if [[ "$gitrepo_commit" != "$last_gitrepo_commit" ]]; then
-          second_parent="-p $gitrepo_commit"
-          last_gitrepo_commit="$gitrepo_commit"
+        if [[ $gitrepo_commit != "$last_gitrepo_commit" ]]; then
+          second_parent=(-p "$gitrepo_commit")
+          last_gitrepo_commit=$gitrepo_commit
         fi
       fi
 
-      o "Create a new commit $first_parent $second_parent"
+      o "Create a new commit ${first_parent[*]} ${second_parent[*]}"
       FAIL=false RUN git cat-file -e "$commit":"$subdir"
       if OK; then
         o "Create with content"
         local PREVIOUS_IFS=$IFS
         IFS=$'\n'
-        local author_info=( $(git log -1 --format=%ad%n%ae%n%an "$commit") )
+        local author_info
+        mapfile -t author_info < <(git log -1 --date=default --format=%ad%n%ae%n%an "$commit")
         IFS=$PREVIOUS_IFS
 
         # When we create new commits we leave the author information unchanged
@@ -772,15 +855,15 @@ subrepo:branch() {
         # This should be analog how cherrypicking is handled allowing git
         # to store both the original author but also the responsible committer
         # that created the local version of the commit and pushed it.
-        prev_commit=$(git log -n 1 --format=%B "$commit" |
-          GIT_AUTHOR_DATE="${author_info[0]}" \
-          GIT_AUTHOR_EMAIL="${author_info[1]}" \
-          GIT_AUTHOR_NAME="${author_info[2]}" \
-          git commit-tree -F - $first_parent $second_parent "$commit":"$subdir")
+        prev_commit=$(git log -n 1 --date=default --format=%B "$commit" |
+          GIT_AUTHOR_DATE=${author_info[0]} \
+          GIT_AUTHOR_EMAIL=${author_info[1]} \
+          GIT_AUTHOR_NAME=${author_info[2]} \
+          git commit-tree -F - "${first_parent[@]}" "${second_parent[@]}" "$commit":"$subdir")
       else
         o "Create empty placeholder"
         prev_commit=$(git commit-tree -m "EMPTY" \
-          $first_parent $second_parent "4b825dc642cb6eb9a060e54bf8d69288fbee4904")
+          "${first_parent[*]}" "${second_parent[*]}" "4b825dc642cb6eb9a060e54bf8d69288fbee4904")
       fi
     done
 
@@ -794,10 +877,10 @@ subrepo:branch() {
   fi
 
   o "Remove the .gitrepo file from $first_gitrepo_commit..$branch"
-  local filter="$branch"
-  [[ -n "$first_gitrepo_commit" ]] && filter="$first_gitrepo_commit..$branch"
+  local filter=$branch
+  [[ $first_gitrepo_commit ]] && filter=$first_gitrepo_commit..$branch
   FAIL=false RUN git filter-branch -f --prune-empty --tree-filter \
-    "rm -f .gitrepo" "$filter"
+    "rm -f .gitrepo" -- "$filter" --first-parent
 
   git:create-worktree "$branch"
 
@@ -812,7 +895,7 @@ subrepo:commit() {
     error "Commit ref '$subrepo_commit_ref' does not exist."
 
   if ! "$force_wanted"; then
-    local upstream="$upstream_head_commit"
+    local upstream=$upstream_head_commit
     o "Make sure '$subrepo_commit_ref' contains the upstream HEAD."
     if ! git:commit-in-rev-list "$upstream" "$subrepo_commit_ref"; then
       error \
@@ -833,29 +916,37 @@ subrepo:commit() {
   RUN git add -f -- "$gitrepo"
 
   local commit_message
-  if [[ -n "$wanted_commit_message" ]]; then
-    commit_message="$wanted_commit_message"
+  if [[ $wanted_commit_message ]]; then
+    commit_message=$wanted_commit_message
   else
-    commit_message="$(get-commit-message)"
+    commit_message=$(get-commit-message)
   fi
 
   local edit_flag=
   $edit_wanted && edit_flag=--edit
 
-  [[ -n $commit_message ]] || commit_message="$(get-commit-message)"
+  [[ $commit_message ]] || commit_message=$(get-commit-message)
 
   local edit_flag=
   $edit_wanted && edit_flag=--edit
 
   o "Commit to the '$original_head_branch' branch."
   if [[ $original_head_commit != none ]]; then
-    RUN git commit $edit_flag -m "$commit_message"
+    if [[ $commit_msg_file ]]; then
+      RUN git commit $edit_flag --file "$commit_msg_file"
+    else
+      RUN git commit $edit_flag -m "$commit_message"
+    fi
   else
     # We had cloned into an empty repo, side effect of prior git reset --mixed
     # command is that subrepo's history is now part of the index. Commit
     # without that history.
     OUT=true RUN git write-tree
-    OUT=true RUN git commit-tree $edit_flag -m "$commit_message" "$output"
+    if [[ $commit_msg_file ]]; then
+      OUT=true RUN git commit-tree $edit_flag --file "$commit_msg_file" "$output"
+    else
+      OUT=true RUN git commit-tree $edit_flag -m "$commit_message" "$output"
+    fi
     RUN git reset --hard "$output"
   fi
 
@@ -894,10 +985,10 @@ subrepo:status() {
       continue
     fi
 
-    refs_subrepo_fetch="refs/subrepo/$subref/fetch"
-    upstream_head_commit="$(
+    refs_subrepo_fetch=refs/subrepo/$subref/fetch
+    upstream_head_commit=$(
       git rev-parse --short "$refs_subrepo_fetch" 2> /dev/null || true
-    )"
+    )
     subrepo_remote=
     subrepo_branch=
 
@@ -914,27 +1005,31 @@ subrepo:status() {
     echo "Git subrepo '$subdir':"
     git:branch-exists "subrepo/$subref" &&
       echo "  Subrepo Branch:  subrepo/$subref"
-    local remote="subrepo/$subref"
+    local remote=subrepo/$subref
     FAIL=false OUT=true RUN git config "remote.$remote.url"
-    [[ -n $output ]] &&
+    [[ $output ]] &&
       echo "  Remote Name:     subrepo/$subref"
     echo "  Remote URL:      $subrepo_remote"
-    [[ -n $upstream_head_commit ]] &&
+    [[ $upstream_head_commit ]] &&
       echo "  Upstream Ref:    $upstream_head_commit"
     echo "  Tracking Branch: $subrepo_branch"
     [[ -z $subrepo_commit ]] ||
-      echo "  Pulled Commit:   $(git rev-parse --short $subrepo_commit)"
-    if [[ -n $subrepo_parent ]]; then
-      echo "  Pull Parent:     $(git rev-parse --short $subrepo_parent)"
+      echo "  Pulled Commit:   $(git rev-parse --short "$subrepo_commit")"
+    if [[ $subrepo_parent ]]; then
+      echo "  Pull Parent:     $(git rev-parse --short "$subrepo_parent")"
     # TODO Remove this eventually:
-    elif [[ -n $subrepo_former ]]; then
-      printf "  Former Commit:   $(git rev-parse --short $subrepo_former)"
+    elif [[ $subrepo_former ]]; then
+      printf "  Former Commit:   %s" "$(git rev-parse --short "$subrepo_former")"
       echo " *** DEPRECATED ***"
     fi
 
     # Grep for directory, branch can be in detached state due to conflicts
-    local _worktree=$(git worktree list | grep "$GIT_TMP/subrepo/$subdir")
-    if [[ -n $_worktree  ]]; then
+    local _worktree
+    _worktree=$(
+      git worktree list |
+        grep "$GIT_TMP/subrepo/$subdir "
+    ) || true
+    if [[ $_worktree  ]]; then
       echo "  Worktree: $_worktree"
     fi
 
@@ -948,13 +1043,13 @@ subrepo:status() {
 
 subrepo:clean() {
   # Remove subrepo branches if exist:
-  local branch="subrepo/$subref"
-  local ref="refs/heads/$branch"
-  local worktree="$GIT_TMP/$branch"
+  local branch=subrepo/$subref
+  local ref=refs/heads/$branch
+  local worktree=$GIT_TMP/$branch
 
   o "Clean $subdir"
   git:remove-worktree
-  if [[ -e .git/$ref ]]; then
+  if git:branch-exists "$branch"; then
     o "Remove branch '$branch'."
     RUN git update-ref -d "$ref"
     clean_list+=("branch '$branch'")
@@ -962,11 +1057,20 @@ subrepo:clean() {
 
   if "$force_wanted"; then
     o "Remove all subrepo refs."
-    if "$all_wanted"; then
-      RUN rm -fr .git/refs/subrepo/
-    else
-      RUN rm -fr .git/refs/subrepo/$subref/
+    local suffix=''
+    if ! $all_wanted; then
+      suffix=$subref/
     fi
+    git show-ref | while read -r hash ref; do
+      if [[ $ref == "refs/subrepo/$suffix"* ]]; then
+        git update-ref -d "$ref"
+      fi
+    done
+    git show-ref | while read -r hash ref; do
+      if [[ $ref == "refs/original/refs/heads/subrepo/$suffix"* ]]; then
+        git update-ref -d "$ref"
+      fi
+    done
   fi
 }
 
@@ -983,9 +1087,9 @@ subrepo:clean() {
 get-command-options() {
   [[ $# -eq 0 ]] && set -- --help
 
-  [[ -n $GIT_SUBREPO_QUIET ]] && quiet_wanted=true
-  [[ -n $GIT_SUBREPO_VERBOSE ]] && verbose_wanted=true
-  [[ -n $GIT_SUBREPO_DEBUG ]] && debug_wanted=true
+  [[ ${GIT_SUBREPO_QUIET-} ]] && quiet_wanted=true
+  [[ ${GIT_SUBREPO_VERBOSE-} ]] && verbose_wanted=true
+  [[ ${GIT_SUBREPO_DEBUG-} ]] && debug_wanted=true
 
   eval "$(
     echo "$GETOPT_SPEC" |
@@ -994,28 +1098,30 @@ get-command-options() {
   )"
 
   while [[ $# -gt 0 ]]; do
-    local option="$1"; shift
+    local option=$1; shift
     case "$option" in
       --) break ;;
       -a) all_wanted=true ;;
       -A) ALL_wanted=true
           all_wanted=true ;;
-      -b) subrepo_branch="$1"
-          override_branch="$1"
+      -b) subrepo_branch=$1
+          override_branch=$1
           commit_msg_args+=("--branch=$1")
           shift ;;
       -e) edit_wanted=true ;;
       -f) force_wanted=true
           commit_msg_args+=("--force") ;;
       -F) fetch_wanted=true ;;
-      -m) wanted_commit_message="$1"
-          shift;;
-      -M) join_method="$1"
+      -m)
+          if [[ $commit_msg_file ]]; then
+            error "fatal: options '-m' and '--file' cannot be used together"
+          fi
+          wanted_commit_message=$1
           shift;;
-      -M) join_method="$1"
+      -M) join_method=$1
           shift;;
-      -r) subrepo_remote="$1"
-          override_remote="$1"
+      -r) subrepo_remote=$1
+          override_remote=$1
           commit_msg_args+=("--remote=$1")
           shift ;;
       -s) squash_wanted=true ;;
@@ -1025,6 +1131,16 @@ get-command-options() {
       -v) verbose_wanted=true ;;
       -d) debug_wanted=true ;;
       -x) set -x ;;
+      --file)
+        if [[ $wanted_commit_message ]]; then
+          error "fatal: options '-m' and '--file' cannot be used together"
+        fi
+        if [ -f "$1" ]; then
+          commit_msg_file="$1"
+        else
+          error "Commit msg file at $1 not found"
+        fi
+        shift ;;
       --version)
         echo "$VERSION"
         exit ;;
@@ -1033,34 +1149,34 @@ get-command-options() {
   done
 
   # Set subrepo command:
-  command="$1"; shift
+  command=$1; shift
 
   # Make sure command exists:
   can "command:$command" ||
     usage-error "'$command' is not a command. See 'git subrepo help'."
 
   command_arguments=("$@")
-  if [[ ${#command_arguments} -gt 0 ]]; then
-    local first="${command_arguments[0]}"
-    first="${first%/}"
-    command_arguments[0]="$first"
+  if [[ ${command_arguments[*]-} && ${#command_arguments[@]} -gt 0 ]]; then
+    local first=${command_arguments[0]}
+    first=${first%/}
+    command_arguments[0]=$first
   fi
   commit_msg_args+=("${command_arguments[@]}")
 
   for option in all ALL edit fetch force squash; do
-    var="${option}_wanted"
+    var=${option}_wanted
     if ${!var}; then
       check_option $option
     fi
   done
 
-  if [[ -n $override_branch ]]; then
+  if [[ $override_branch ]]; then
     check_option branch
   fi
-  if [[ -n $override_remote ]]; then
+  if [[ $override_remote ]]; then
     check_option remote
   fi
-  if [[ -n $wanted_commit_message ]]; then
+  if [[ $wanted_commit_message || $commit_msg_file ]]; then
     check_option message
   fi
   if $update_wanted; then
@@ -1077,13 +1193,13 @@ options_clean='ALL all force'
 options_clone='branch edit force message method'
 options_config='force'
 options_commit='edit fetch force message'
-options_fetch='all branch remote'
+options_fetch='all branch force remote'
 options_init='branch remote method'
 options_pull='all branch edit force message remote update'
-options_push='all branch force remote squash update'
+options_push='all branch force message remote squash update'
 options_status='ALL all fetch'
 check_option() {
-  local var="options_${command//-/_}"
+  local var=options_${command//-/_}
   [[ ${!var} =~ $1 ]] ||
     usage-error "Invalid option '--$1' for '$command'."
 }
@@ -1096,8 +1212,8 @@ command-init() {
   # Export variable to let other processes (possibly git hooks) know that they
   # are running under git-subrepo. Set to current process pid, so it can be
   # further verified if need be:
-  export GIT_SUBREPO_RUNNING="$$"
-  export GIT_SUBREPO_COMMAND="$command"
+  export GIT_SUBREPO_RUNNING=$$
+  export GIT_SUBREPO_COMMAND=$command
 
   : "${GIT_SUBREPO_PAGER:=${PAGER:-less}}"
   if [[ $GIT_SUBREPO_PAGER == less ]]; then
@@ -1110,7 +1226,7 @@ command-prepare() {
   if git:rev-exists HEAD; then
     git:get-head-branch-commit
   fi
-  original_head_commit="${output:-none}"
+  original_head_commit=${output:-none}
 }
 
 # Do the setup steps needed by most of the subrepo subcommands:
@@ -1119,14 +1235,19 @@ command-setup() {
 
   check-and-normalize-subdir
   encode-subdir
-  gitrepo="$subdir/.gitrepo"
+  gitrepo=$subdir/.gitrepo
 
   if ! $force_wanted; then
     o "Check for worktree with branch subrepo/$subdir"
-    local _worktree=$(git worktree list | grep "\[subrepo/$subdir\]" | cut -d ' ' -f1)
+    local _worktree
+    _worktree=$(
+      git worktree list |
+        grep "\[subrepo/$subdir\]" |
+        cut -d ' ' -f1
+    ) || true
     if [[ $command =~ ^(commit)$ && -z $_worktree ]]; then
       error "There is no worktree available, use the branch command first"
-    elif [[ ! $command =~ ^(branch|clean|commit|push)$ && -n $_worktree ]]; then
+    elif [[ ! $command =~ ^(branch|clean|commit|push)$ && $_worktree ]]; then
       if [[ -e $gitrepo ]]; then
         error "There is already a worktree with branch subrepo/$subdir.
 Use the --force flag to override this check or perform a subrepo clean
@@ -1142,10 +1263,10 @@ Use the --force flag to override this check or remove the worktree with
   fi
 
   # Set refs_ variables:
-  refs_subrepo_branch="refs/subrepo/$subref/branch"
-  refs_subrepo_commit="refs/subrepo/$subref/commit"
-  refs_subrepo_fetch="refs/subrepo/$subref/fetch"
-  refs_subrepo_push="refs/subrepo/$subref/push"
+  refs_subrepo_branch=refs/subrepo/$subref/branch
+  refs_subrepo_commit=refs/subrepo/$subref/commit
+  refs_subrepo_fetch=refs/subrepo/$subref/fetch
+  refs_subrepo_push=refs/subrepo/$subref/push
 
   # Read/parse the .gitrepo file (unless clone/init; doesn't exist yet)
   if [[ ! $command =~ ^(clone|init)$ ]]; then
@@ -1156,33 +1277,34 @@ Use the --force flag to override this check or remove the worktree with
 }
 
 # Parse command line args according to a simple dsl spec:
+# shellcheck disable=2059
 get-params() {
   local i=0
   local num=${#command_arguments[@]}
-  for arg in $@; do
-    local value="${command_arguments[i]}"
-    value="${value//%/%%}"
-    value="${value//\\/\\\\}"
+  for arg in "$@"; do
+    local value=${command_arguments[i]-}
+    value=${value//%/%%}
+    value=${value//\\/\\\\}
     # If arg starts with '+' then it is required
     if [[ $arg == +* ]]; then
       if [[ $i -ge $num ]]; then
         usage-error "Command '$command' requires arg '${arg#+}'."
       fi
-      printf -v ${arg#+} -- "$value"
+      printf -v "${arg#+}" -- "$value"
     # Look for function name after ':' to provide a default value
     else
       if [[ $i -lt $num ]]; then
-        printf -v ${arg%:*} -- "$value"
+        printf -v "${arg%:*}" -- "$value"
       elif [[ $arg =~ : ]]; then
         "${arg#*:}"
       fi
     fi
-    let i=$((i+1))
+    : $((i++))
   done
 
   # Check for extra arguments:
   if [[ $num -gt $i ]]; then
-    set -- ${command_arguments[@]}
+    set -- "${command_arguments[@]}"
     for ((j = 1; j <= i; j++)); do shift; done
     error "Unknown argument(s) '$*' for '$command' command."
   fi
@@ -1190,24 +1312,24 @@ get-params() {
 
 check-and-normalize-subdir() {
   # Sanity check subdir:
-  [[ -n $subdir ]] ||
+  [[ $subdir ]] ||
     die "subdir not set"
   [[ $subdir =~ ^/ || $subdir =~ ^[A-Z]: ]] &&
     usage-error "The subdir '$subdir' should not be absolute path."
-  subdir="${subdir#./}"
-  subdir="${subdir%/}"
+  subdir=${subdir#./}
+  subdir=${subdir%/}
   [[ $subdir != *//* ]] || subdir=$(tr -s / <<< "$subdir")
 }
 
 # Determine the correct subdir path to use:
 guess-subdir() {
-  local dir="$subrepo_remote"
-  dir="${dir%.git}"
-  dir="${dir%/}"
-  dir="${dir##*/}"
+  local dir=$subrepo_remote
+  dir=${dir%.git}
+  dir=${dir%/}
+  dir=${dir##*/}
   [[ $dir =~ ^[-_a-zA-Z0-9]+$ ]] ||
     error "Can't determine subdir from '$subrepo_remote'."
-  subdir="$dir"
+  subdir=$dir
   check-and-normalize-subdir
   encode-subdir
 }
@@ -1254,7 +1376,8 @@ encode-subdir() {
   local i
   for (( i = 1; i < 32; ++i )); do
     # skip substitute NUL char (i=0), as bash will skip NUL in env
-    local x=$(printf "%02x" $i)
+    local x
+    x=$(printf "%02x" "$i")
     subref=${subref//$(printf "%b" "\x$x")/%$x}
   done
   subref=${subref//$'\177'/%7f}
@@ -1298,7 +1421,7 @@ encode-subdir() {
 
 # Set subdir and gitrepo vars:
 read-gitrepo-file() {
-  gitrepo="$subdir/.gitrepo"
+  gitrepo=$subdir/.gitrepo
 
   if [[ ! -f $gitrepo ]]; then
     error "No '$gitrepo' file."
@@ -1307,34 +1430,34 @@ read-gitrepo-file() {
   # Read .gitrepo values:
   if [[ -z $subrepo_remote ]]; then
     SAY=false OUT=true RUN git config --file="$gitrepo" subrepo.remote
-    subrepo_remote="$output"
+    subrepo_remote=$output
   fi
 
   if [[ -z $subrepo_branch ]]; then
     SAY=false OUT=true RUN git config --file="$gitrepo" subrepo.branch
-    subrepo_branch="$output"
+    subrepo_branch=$output
   fi
 
   SAY=false OUT=true RUN git config --file="$gitrepo" subrepo.commit
-  subrepo_commit="$output"
+  subrepo_commit=$output
 
   FAIL=false \
   SAY=false OUT=true RUN git config --file="$gitrepo" subrepo.parent
-  subrepo_parent="$output"
+  subrepo_parent=$output
 
   FAIL=false \
   SAY=false OUT=true RUN git config --file="$gitrepo" subrepo.method
-  if [[ $output == "rebase" ]]; then
-    join_method="rebase"
+  if [[ $output == rebase ]]; then
+    join_method=rebase
   else
     # This is the default method
-    join_method="merge"
+    join_method=merge
   fi
 
   if [[ -z $subrepo_parent ]]; then
     FAIL=false \
       SAY=false OUT=true RUN git config --file="$gitrepo" subrepo.former
-    subrepo_former="$output"
+    subrepo_former=$output
   fi
 }
 
@@ -1357,7 +1480,7 @@ update-gitrepo-file() {
 ; DO NOT EDIT (unless you know what you are doing)
 ;
 ; This subdirectory is a git "subrepo", and this file is maintained by the
-; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
+; git-subrepo command. See https://github.com/ingydotnet/git-subrepo#readme
 ;
 ...
     fi
@@ -1365,25 +1488,25 @@ update-gitrepo-file() {
 
 
   # TODO: only update remote and branch if supplied and $update_wanted
-  if $newfile || [[ $update_wanted && -n $override_remote ]]; then
+  if $newfile || [[ $update_wanted && $override_remote ]]; then
     RUN git config --file="$gitrepo" subrepo.remote "$subrepo_remote"
   fi
 
-  if $newfile || [[ $update_wanted && -n $override_branch ]]; then
+  if $newfile || [[ $update_wanted && $override_branch ]]; then
     RUN git config --file="$gitrepo" subrepo.branch "$subrepo_branch"
   fi
 
   RUN git config --file="$gitrepo" subrepo.commit "$upstream_head_commit"
   # Only write new parent when we are at the head of upstream
-  if [[ -n $upstream_head_commit && -n $subrepo_commit_ref ]]; then
+  if [[ $upstream_head_commit && $subrepo_commit_ref ]]; then
     OUT=true RUN git rev-parse "$subrepo_commit_ref"
     o "$upstream_head_commit == $output"
-    if [[ $upstream_head_commit == $output ]]; then
+    if [[ $upstream_head_commit == "$output" ]]; then
       RUN git config --file="$gitrepo" subrepo.parent "$original_head_commit"
     fi
   fi
 
-  [[ -z $join_method ]] && join_method="merge"
+  [[ -z $join_method ]] && join_method=merge
   RUN git config --file="$gitrepo" subrepo.method "$join_method"
 
   RUN git config --file="$gitrepo" subrepo.cmdver "$VERSION"
@@ -1402,15 +1525,30 @@ assert-environment-ok() {
 
   git_version=$(git --version | cut -d ' ' -f3)
 
-  if [[ $(
-          printf "$REQUIRED_GIT_VERSION\n$git_version" |
-          sort -t. -k 1,1n -k 2,2n -k 3,3n |
-          head -n1
-        ) == "$git_version" &&
-       $git_version != "$REQUIRED_GIT_VERSION"
-  ]]; then
+  version-check bash "$REQUIRED_BASH_VERSION" || {
+    echo "The 'bashplus' library requires that 'Bash ${REQUIRED_BASH_VERSION}+' is installed." >&2
+    echo "It doesn't need to be your shell, but it must be in your PATH." >&2
+    if [[ ${OSTYPE-} == darwin* ]]; then
+      echo "You appear to be on macOS." >&2
+      echo "Try: 'brew install bash'." >&2
+      echo "This will not change your user shell, it just installs 'Bash 5.x'." >&2
+    fi
+    exit 1
+  }
+
+  version-check git "$REQUIRED_GIT_VERSION" ||
     error "Requires git version $REQUIRED_GIT_VERSION or higher; "`
          `"you have '$git_version'."
+
+  if [[ ${BASH_VERSINFO[0]} -lt 4 ]] ; then
+    echo "The git-subrepo command requires that 'Bash 4+' is installed."
+    echo "It doesn't need to be your shell, but it must be in your PATH."
+    if [[ $OSTYPE == darwin* ]]; then
+      echo "You appear to be on macOS."
+      echo "Try: 'brew install bash'."
+      echo "This will not change your user shell, it just installs 'Bash 5.x'."
+    fi
+    exit 1
   fi
 }
 
@@ -1425,7 +1563,7 @@ assert-repo-is-ready() {
 
   # Get the original branch and commit:
   git:get-head-branch-name
-  original_head_branch="$output"
+  original_head_branch=$output
 
   # If a subrepo branch is currently checked out, then note it:
   if [[ $original_head_branch =~ ^subrepo/(.*) ]]; then
@@ -1448,7 +1586,7 @@ assert-repo-is-ready() {
   assert-working-copy-is-clean
 
   # For now, only support actions from top of repo:
-  if [[ -n "$(git rev-parse --show-prefix)" ]]; then
+  if [[ $(git rev-parse --show-prefix) ]]; then
     error "Need to run subrepo command from top level directory of the repo."
   fi
 }
@@ -1457,7 +1595,8 @@ assert-working-copy-is-clean() {
   # Repo is in a clean state:
   if [[ $command =~ ^(clone|init|pull|push|branch|commit)$ ]]; then
     # TODO: Should we check for untracked files?
-    local pwd=$(pwd)
+    local pwd
+    pwd=$(pwd)
     o "Assert that working copy is clean: $pwd"
     git update-index -q --ignore-submodules --refresh
     git diff-files --quiet --ignore-submodules ||
@@ -1485,14 +1624,14 @@ assert-subdir-ready-for-init() {
     error "The subdir '$subdir' is already a subrepo."
   fi
   # Check that subdir is part of the repo
-  if [[ -z $(git log -1 -- $subdir) ]]; then
+  if [[ -z $(git log -1 --date=default -- "$subdir") ]]; then
     error "The subdir '$subdir' is not part of this repo."
   fi
 }
 
 # If subdir exists, make sure it is empty:
 assert-subdir-empty() {
-  if [[ -e $subdir ]] && [[ -n $(ls -A $subdir) ]]; then
+  if [[ -e $subdir ]] && [[ $(ls -A "$subdir") ]]; then
     error "The subdir '$subdir' exists and is not empty."
   fi
 }
@@ -1504,13 +1643,8 @@ assert-subdir-empty() {
 # Find all the current subrepos by looking for all the subdirectories that
 # contain a `.gitrepo` file.
 get-all-subrepos() {
-  local paths=($(
-    find . -name '.gitrepo' |
-      grep -v '/.git/' |
-      grep '/.gitrepo$' |
-      sed 's/.gitrepo$//' |
-      sort
-  ))
+  local paths
+  mapfile -t paths < <(git ls-files | sed -n 's!/\.gitrepo$!!p' | sort)
   subrepos=()
   local path
   for path in "${paths[@]}"; do
@@ -1521,7 +1655,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")
@@ -1529,31 +1663,28 @@ add-subrepo() {
 
 # Determine the upstream's default head branch:
 get-upstream-head-branch() {
-  OUT=true RUN git ls-remote $subrepo_remote
-  local remotes="$output"
-  [[ -n $remotes ]] ||
-    error "Failed to 'git ls-remote $subrepo_remote'."
-  local commit="$(
-    echo "$remotes" |
-    grep HEAD |
-    cut -f1
-  )"
-  local branch="$(
+  local remotes branch
+  OUT=true RUN git ls-remote --symref "$subrepo_remote"
+  remotes=$output
+  [[ $remotes ]] ||
+    error "Failed to 'git ls-remote --symref $subrepo_remote'."
+
+  # 'ref: refs/heads/master  HEAD'
+  branch=$(
     echo "$remotes" |
-    grep -E "$commit[[:space:]]+refs/heads/" |
-    grep -v HEAD |
-    head -n1 |
-    cut -f2
-  )"
+    grep "^ref:" | grep 'HEAD$' | cut -f2 -d':' | cut -f1 |
+    head -n1
+  )
+  branch=${branch/ }
   [[ $branch =~ refs/heads/ ]] ||
     error "Problem finding remote default head branch."
-  output="${branch#refs/heads/}"
+  output=${branch#refs/heads/}
 }
 
 # Commit msg for an action commit:
 # Don't use RUN here as it will pollute commit message
 get-commit-message() {
-  local commit="none"
+  local commit=none
   if git:rev-exists "$upstream_head_commit"; then
     commit=$(git rev-parse --short "$upstream_head_commit")
   fi
@@ -1562,19 +1693,19 @@ get-commit-message() {
   if $all_wanted; then
     args+=("$subdir")
   fi
-  args+=(${commit_msg_args[@]})
+  args+=("${commit_msg_args[@]}")
 
   # Find the specific git-subrepo code used:
   local command_remote='???'
   local command_commit='???'
   get-command-info
 
-  local merged="none"
+  local merged=none
   if git:rev-exists "$subrepo_commit_ref"; then
     merged=$(git rev-parse --short "$subrepo_commit_ref")
   fi
 
-  local is_merge=""
+  local is_merge=''
   if [[ $command != push ]]; then
     if git:is_merge_commit "$subrepo_commit_ref"; then
       is_merge=" (merge)"
@@ -1585,7 +1716,7 @@ get-commit-message() {
 
   # Format subrepo commit message:
   cat <<...
-git subrepo $command$is_merge ${args[@]}
+git subrepo $command$is_merge ${args[*]}
 
 subrepo:
   subdir:   "$subdir"
@@ -1605,9 +1736,10 @@ git-subrepo:
 # info goes into commit messages, so we can find out exactly how the commits
 # were done.
 get-command-info() {
-  local bin="$0"
+  local bin=$0
   if [[ $bin =~ / ]]; then
-    local lib="$(dirname "$bin")"
+    local lib
+    lib=$(dirname "$bin")
     # XXX Makefile needs to install these symlinks:
     # If `git-subrepo` was system-installed (`make install`):
     if [[ -e $lib/git-subrepo.d/upstream ]] &&
@@ -1615,31 +1747,34 @@ get-command-info() {
       command_remote=$(readlink "$lib/git-subrepo.d/upstream")
       command_commit=$(readlink "$lib/git-subrepo.d/commit")
     elif [[ $lib =~ / ]]; then
-      lib="$(dirname "$lib")"
+      lib=$(dirname "$lib")
       if [[ -d $lib/.git ]]; then
-        local remote="$(
+        local remote
+        remote=$(
           GIT_DIR=$lib/.git git remote -v |
             grep '^origin' |
             head -n1 |
             cut -f2 |
             cut -d ' ' -f1
-        )"
-        if [[ -n $remote ]]; then
-          command_remote="$remote"
+        )
+        if [[ $remote ]]; then
+          command_remote=$remote
         else
-          local remote="$(
+          local remote
+          remote=$(
             GIT_DIR=$lib/.git git remote -v |
               head -n1 |
               cut -f2 |
               cut -d ' ' -f1
-          )"
-          if [[ -n $remote ]]; then
-            command_remote="$remote"
+          )
+          if [[ $remote ]]; then
+            command_remote=$remote
           fi
         fi
-        local commit="$(GIT_DIR="$lib/.git" git rev-parse --short HEAD)"
-        if [[ -n $commit ]]; then
-          command_commit="$commit"
+        local commit
+        commit=$(GIT_DIR=$lib/.git git rev-parse --short HEAD)
+        if [[ $commit ]]; then
+          command_commit=$commit
         fi
       fi
     fi
@@ -1664,7 +1799,7 @@ This is the common conflict resolution workflow:
   3. "git add" the resolved files.
 ...
 
-  if [[ "$join_method" == "rebase" ]]; then
+  if [[ $join_method == rebase ]]; then
     cat <<...
   4. git rebase --continue
 ...
@@ -1678,18 +1813,24 @@ This is the common conflict resolution workflow:
   5. If there are more conflicts, restart at step 2.
   6. cd $start_pwd
 ...
-  local branch_name="${branch:=subrepo/$subdir}"
-  if [[ "$command" == "push" ]]; then
+  local branch_name=${branch:=subrepo/$subdir}
+  if [[ $command == push ]]; then
     cat <<...
   7. git subrepo push $subdir $branch_name
 ...
   else
+    if [[ $commit_msg_file ]]; then
+    cat <<...
+  7. git subrepo commit --file=$commit_msg_file $subdir
+...
+    else
     cat <<...
   7. git subrepo commit $subdir
 ...
+    fi
   fi
 
-  if [[ "$command" == "pull" && "$join_method" == "rebase" ]]; then
+  if [[ $command == pull && $join_method == rebase ]]; then
     cat <<...
 
 After you have performed the steps above you can push your local changes
@@ -1724,46 +1865,48 @@ git:rev-exists() {
 }
 
 git:ref-exists() {
-  test -n "$(git for-each-ref "$1")"
+  [[ $(git for-each-ref "$1") ]]
 }
 
 git:get-head-branch-name() {
   output=
-  local name="$(git symbolic-ref --short --quiet HEAD)"
+  local name
+  name=$(git symbolic-ref --short --quiet HEAD) || true
   [[ $name == HEAD ]] && return
-  output="$name"
+  output=$name
 }
 
 git:get-head-branch-commit() {
-  output="$(git rev-parse HEAD)"
+  output=$(git rev-parse HEAD)
 }
 
 git:commit-in-rev-list() {
-  local commit="$1"
-  local list_head="$2"
+  local commit=$1
+  local list_head=$2
   git rev-list "$list_head" | grep -q "^$commit"
 }
 
 git:make-ref() {
-  local ref_name="$1"
-  local commit="$(git rev-parse "$2")"
+  local ref_name=$1
+  local commit
+  commit=$(git rev-parse "$2")
   RUN git update-ref "$ref_name" "$commit"
 }
 
 git:is_merge_commit() {
-  local commit="$1"
+  local commit=$1
   git show --summary "$commit" | grep -q ^Merge:
 }
 
 git:create-worktree() {
-  local branch="$1"
-  worktree="$GIT_TMP/$branch"
+  local branch=$1
+  worktree=$GIT_TMP/$branch
   RUN git worktree add "$worktree" "$branch"
 }
 
 git:remove-worktree() {
   o "Remove worktree: $worktree"
-  if [[ -d "$worktree" ]]; then
+  if [[ -d $worktree ]]; then
     o "Check worktree for unsaved changes"
     cd "$worktree"
     assert-working-copy-is-clean
@@ -1776,7 +1919,7 @@ git:remove-worktree() {
 }
 
 git:delete-branch() {
-  local branch="$1"
+  local branch=$1
   o "Deleting old '$branch' branch."
   # Remove worktree first, otherwise you can't delete the branch
   git:remove-worktree
@@ -1790,7 +1933,7 @@ git:delete-branch() {
 
 # Smart command runner:
 RUN() {
-  $debug_wanted && $SAY && say '>>>' $*
+  $debug_wanted && $SAY && say ">>> $*"
   if $EXEC; then
     "$@"
     return $?
@@ -1804,9 +1947,9 @@ RUN() {
     "$@"
   else
     if $OUT; then
-      out="$("$@" 2>/dev/null)"
+      out=$("$@" 2>/dev/null)
     else
-      out="$("$@" 2>&1)"
+      out=$("$@" 2>&1)
     fi
   fi
   rc=$?
@@ -1816,7 +1959,7 @@ RUN() {
     OK=false
     $FAIL && error "Command failed: '$*'.\n$out"
   fi
-  output="$out"
+  output=$out
 }
 
 
@@ -1837,7 +1980,7 @@ CALL() {
 # Print verbose steps for commands with steps:
 o() {
   if $verbose_wanted; then
-    echo "$INDENT* $@"
+    echo "$INDENT* $*"
   fi
 }
 
@@ -1871,13 +2014,12 @@ usage-error() {
 
 # Nicely report common error messages:
 error() {
-  local msg="git-subrepo: $1" usage=
-  echo -e "$msg" >&2
+  echo -e "git-subrepo:" "$@" >&2
   exit 1
 }
 
 # Start at the end:
-[[ $BASH_SOURCE != "$0" ]] || main "$@"
+[[ ${BASH_SOURCE[0]} != "$0" ]] || main "$@"
 
 # Local Variables:
 # tab-width: 2
diff --git a/lib/git-subrepo.d/help-functions.bash b/lib/git-subrepo.d/help-functions.bash
index 10cda704..c7fc64db 100644
--- a/lib/git-subrepo.d/help-functions.bash
+++ b/lib/git-subrepo.d/help-functions.bash
@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 # DO NOT EDIT. This file generated by pkg/bin/generate-help-functions.pl.
 
 set -e
@@ -8,14 +6,14 @@ help:all() {
     cat <<'...'
 branch               branch <subdir>|--all [-f] [-F]
 clean                clean <subdir>|--all|--ALL [-f]
-clone                clone <repository> [<subdir>] [-b <branch>] [-f] [-m <msg>] [-e] [--method <merge|rebase>]
-commit               commit <subdir> [<subrepo-ref>] [-m <msg>] [-e] [-f] [-F]
+clone                clone <repository> [<subdir>] [-b <branch>] [-f] [-m <msg>] [--file=<msg file>] [-e] [--method <merge|rebase>]
+commit               commit <subdir> [<subrepo-ref>] [-m <msg>] [--file=<msg file>] [-e] [-f] [-F]
 config               config <subdir> <option> [<value>] [-f]
-fetch                fetch <subdir>|--all [-r <remote>] [-b <branch>]
+fetch                fetch <subdir>|--force --all [-r <remote>] [-b <branch>]
 help                 help [<command>|--all]
 init                 init <subdir> [-r <remote>] [-b <branch>] [--method <merge|rebase>]
-pull                 pull <subdir>|--all [-M|-R|-f] [-m <msg>] [-e] [-b <branch>] [-r <remote>] [-u]
-push                 push <subdir>|--all [<branch>] [-r <remote>] [-b <branch>] [-M|-R] [-u] [-f] [-s] [-N]
+pull                 pull <subdir>|--all [-M|-R|-f] [-m <msg>] [--file=<msg file>] [-e] [-b <branch>] [-r <remote>] [-u]
+push                 push <subdir>|--all [<branch>] [-m msg] [--file=<msg file>] [-r <remote>] [-b <branch>] [-M|-R] [-u] [-f] [-s] [-N]
 status               status [<subdir>|--all|--ALL] [-F] [-q|-v]
 upgrade              upgrade
 version              version [-q|-v]
@@ -71,7 +69,7 @@ help:clean() {
 help:clone() {
     cat <<'...'
 
-  Usage: git subrepo clone <repository> [<subdir>] [-b <branch>] [-f] [-m <msg>] [-e] [--method <merge|rebase>]
+  Usage: git subrepo clone <repository> [<subdir>] [-b <branch>] [-f] [-m <msg>] [--file=<msg file>] [-e] [--method <merge|rebase>]
 
 
   Add a repository as a subrepo in a subdir of your repository.
@@ -94,15 +92,15 @@ help:clone() {
   The `--method` option will decide how the join process between branches are
    performed. The default option is merge.
 
-  The `clone` command accepts the `--branch=` `--edit`, `--force` and
-  `--message=` options.
+  The `clone` command accepts the `--branch=` `--edit`, `--file`, `--force`
+  and `--message=` options.
 ...
 }
 
 help:commit() {
     cat <<'...'
 
-  Usage: git subrepo commit <subdir> [<subrepo-ref>] [-m <msg>] [-e] [-f] [-F]
+  Usage: git subrepo commit <subdir> [<subrepo-ref>] [-m <msg>] [--file=<msg file>] [-e] [-f] [-F]
 
 
   Add subrepo branch to current history as a single commit.
@@ -116,8 +114,8 @@ help:commit() {
   branch history. That way the same branch can push upstream. Use the
   `--force` option to commit anyway.
 
-  The `commit` command accepts the `--edit`, `--fetch`, `--force` and
-  `--message=` options.
+  The `commit` command accepts the `--edit`, `--fetch`, `--file`, `--force`
+  and `--message=` options.
 ...
 }
 
@@ -142,7 +140,7 @@ help:config() {
 help:fetch() {
     cat <<'...'
 
-  Usage: git subrepo fetch <subdir>|--all [-r <remote>] [-b <branch>]
+  Usage: git subrepo fetch <subdir>|--force --all [-r <remote>] [-b <branch>]
 
 
   Fetch the remote/upstream content for a subrepo.
@@ -152,7 +150,7 @@ help:fetch() {
   `subrepo/<subdir>`. These are temporary and you can easily remove them with
   the subrepo `clean` command.
 
-  The `fetch` command accepts the `--all`, `--branch=` and `--remote=` options.
+  The `fetch` command accepts the `--force`, `--all`, `--branch=` and `--remote=` options.
 ...
 }
 
@@ -165,7 +163,7 @@ help:help() {
   Same as `git help subrepo`. Will launch the manpage. For the shorter usage,
   use `git subrepo -h`.
 
-  Use `git subrepo help <command> to get help for a specific command. Use
+  Use `git subrepo help <command>` to get help for a specific command. Use
   `--all` to get a summary of all commands.
 
   The `help` command accepts the `--all` option.
@@ -189,7 +187,7 @@ help:init() {
   If you specify the `--remote` (and optionally the `--branch`) option, the
   values will be added to the `<subdir>/.gitrepo` file. The `--remote` option
   is the upstream URL, and the `--branch` option is the upstream branch to push
-  to. These values will be needed to do a `git subrepo push` command, but they
+  to. These values will be needed to do a `git subrepo push` command, but they
   can be provided later on the `push` command (and saved to `<subdir>/.gitrepo`
   if you also specify the `--update` option).
 
@@ -206,7 +204,7 @@ help:init() {
 help:pull() {
     cat <<'...'
 
-  Usage: git subrepo pull <subdir>|--all [-M|-R|-f] [-m <msg>] [-e] [-b <branch>] [-r <remote>] [-u]
+  Usage: git subrepo pull <subdir>|--all [-M|-R|-f] [-m <msg>] [--file=<msg file>] [-e] [-b <branch>] [-r <remote>] [-u]
 
 
   Update the subrepo subdir with the latest upstream changes.
@@ -244,10 +242,6 @@ help:pull() {
   specify a `--rebase`, `--merge` or `--force` strategy. The latter is the same
   as a `clone --force` operation, using the current remote and branch.
 
-  When you pull you can assume a fast-forward strategy (default) or you can
-  specify a `--rebase`, `--merge` or `--force` strategy. The latter is the same
-  as a `clone --force` operation, using the current remote and branch.
-
   Like the `clone` command, `pull` will squash all the changes (since the last
   pull or clone) into one commit. This keeps your mainline history nice and
   clean. You can easily see the subrepo's history with the `git log` command:
@@ -256,15 +250,15 @@ help:pull() {
 
   The set of commands used above are described in detail below.
 
-  The `pull` command accepts the `--all`, `--branch=`, `--edit`, `--force`,
-  `--message=`, `--remote=` and `--update` options.
+  The `pull` command accepts the `--all`, `--branch=`, `--edit`, `--file`,
+  `--force`, `--message=`, `--remote=` and `--update` options.
 ...
 }
 
 help:push() {
     cat <<'...'
 
-  Usage: git subrepo push <subdir>|--all [<branch>] [-r <remote>] [-b <branch>] [-M|-R] [-u] [-f] [-s] [-N]
+  Usage: git subrepo push <subdir>|--all [<branch>] [-m msg] [--file=<msg file>] [-r <remote>] [-b <branch>] [-M|-R] [-u] [-f] [-s] [-N]
 
 
   Push a properly merged subrepo branch back upstream.
@@ -289,8 +283,9 @@ help:push() {
   discouraged. Only use this option if you fully understand it. (The `--force`
   option will NOT check for a proper merge. ANY branch will be force pushed!)
 
-  The `push` command accepts the `--all`, `--branch=`, `--dry-run`, `--force`,
-  `--merge`, `--rebase`, `--remote=`, `--squash` and `--update` options.
+  The `push` command accepts the `--all`, `--branch=`, `--dry-run`, `--file`,
+  `--force`, `--merge`, `--message`, `--rebase`, `--remote=`, `--squash` and
+  `--update` options.
 ...
 }
 
diff --git a/man/man1/git-subrepo.1 b/man/man1/git-subrepo.1
index babcd951..7c41c5f0 100644
--- a/man/man1/git-subrepo.1
+++ b/man/man1/git-subrepo.1
@@ -1,4 +1,5 @@
-.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35)
+.\" -*- mode: troff; coding: utf-8 -*-
+.\" Automatically generated by Pod::Man 5.0102 (Pod::Simple 3.45)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -15,29 +16,12 @@
 .ft R
 .fi
 ..
-.\" Set up some character translations and predefined strings.  \*(-- will
-.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
-.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
-.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
-.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
-.\" nothing in troff, for use with C<>.
-.tr \(*W-
-.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.\" \*(C` and \*(C' are quotes in nroff, nothing in troff, for use with C<>.
 .ie n \{\
-.    ds -- \(*W-
-.    ds PI pi
-.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
-.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
-.    ds L" ""
-.    ds R" ""
 .    ds C` ""
 .    ds C' ""
 'br\}
 .el\{\
-.    ds -- \|\(em\|
-.    ds PI \(*p
-.    ds L" ``
-.    ds R" ''
 .    ds C`
 .    ds C'
 'br\}
@@ -71,15 +55,15 @@
 .\" ========================================================================
 .\"
 .IX Title "STDIN 1"
-.TH STDIN 1 "November 2018" "Generated by Swim v0.1.46" "Git Submodule Alternative"
+.TH STDIN 1 2025-02-09 "Generated by Swim v0.1.48" "Git Submodule Alternative"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
-.SH "Name"
+.SH Name
 .IX Header "Name"
 git-subrepo \- Git Submodule Alternative
-.SH "Synopsis"
+.SH Synopsis
 .IX Header "Synopsis"
 .Vb 1
 \&    git subrepo \-h    # Help Overview
@@ -101,71 +85,71 @@ git-subrepo \- Git Submodule Alternative
 \&    git subrepo version
 \&    git subrepo upgrade
 .Ve
-.SH "Description"
+.SH Description
 .IX Header "Description"
-This git command \*(L"clones\*(R" an external git repo into a subdirectory of your
+This git command "clones" an external git repo into a subdirectory of your
 repo. Later on, upstream changes can be pulled in, and local changes can be
 pushed back. Simple.
-.SH "Benefits"
+.SH Benefits
 .IX Header "Benefits"
 This command is an improvement from \f(CW\*(C`git\-submodule\*(C'\fR and \f(CW\*(C`git\-subtree\*(C'\fR; two
 other git commands with similar goals, but various problems.
 .PP
 It assumes there are 3 main roles of people interacting with a repo, and
 attempts to serve them all well:
-.IP "\(bu" 4
+.IP \(bu 4
 \&\fBowner\fR \- The person who authors/owns/maintains a repo.
-.IP "\(bu" 4
+.IP \(bu 4
 \&\fBusers\fR \- People who are just using/installing the repo.
-.IP "\(bu" 4
+.IP \(bu 4
 \&\fBcollaborators\fR \- People who commit code to the repo and subrepos.
 .PP
 The \f(CW\*(C`git\-subrepo\*(C'\fR command benefits these roles in the following ways:
-.IP "\(bu" 4
+.IP \(bu 4
 Simple and intuitive commandline usage (with tab completion).
-.IP "\(bu" 4
+.IP \(bu 4
 Users get your repo and all your subrepos just by cloning your repo.
-.IP "\(bu" 4
+.IP \(bu 4
 Users do not need to install \f(CW\*(C`git\-subrepo\*(C'\fR, ever.
-.IP "\(bu" 4
+.IP \(bu 4
 Collaborators do not need to install unless they want to push/pull.
-.IP "\(bu" 4
+.IP \(bu 4
 Collaborators know when a subdir is a subrepo (it has a \f(CW\*(C`.gitrepo\*(C'\fR file).
-.IP "\(bu" 4
+.IP \(bu 4
 The \f(CW\*(C`.gitrepo\*(C'\fR file never gets pushed back to the subrepo upstream.
-.IP "\(bu" 4
+.IP \(bu 4
 Well named branches and remotes are generated for manual operations.
-.IP "\(bu" 4
+.IP \(bu 4
 Owners do not deal with the complications of keeping submodules in sync.
-.IP "\(bu" 4
+.IP \(bu 4
 Subrepo repositories can contain subrepos themselves.
-.IP "\(bu" 4
+.IP \(bu 4
 Branching with subrepos JustWorks™.
-.IP "\(bu" 4
+.IP \(bu 4
 Different branches can have different subrepos in different states, etc.
-.IP "\(bu" 4
+.IP \(bu 4
 Moving/renaming/deleting a subrepo subdir JustWorks™.
-.IP "\(bu" 4
+.IP \(bu 4
 You can \f(CW\*(C`init\*(C'\fR an existing subdirectory into a subrepo.
-.IP "\(bu" 4
+.IP \(bu 4
 Your git history is kept squeaky clean.
-.IP "\(bu" 4
+.IP \(bu 4
 Upstream history (clone/pull) is condensed into a single commit.
-.IP "\(bu" 4
+.IP \(bu 4
 Pulls can use a \f(CW\*(C`merge\*(C'\fR, \f(CW\*(C`rebase\*(C'\fR or \f(CW\*(C`force\*(C'\fR strategies.
-.IP "\(bu" 4
+.IP \(bu 4
 You can see the subrepo history with \f(CW\*(C`git log subrepo/<subdir>/fetch\*(C'\fR.
-.IP "\(bu" 4
+.IP \(bu 4
 Commits pushed back upstream are \fBnot\fR condensed (by default).
-.IP "\(bu" 4
+.IP \(bu 4
 Trivial to try any subrepo operations and then reset back.
-.IP "\(bu" 4
+.IP \(bu 4
 No configuration required.
-.IP "\(bu" 4
+.IP \(bu 4
 Does not introduce history that messes up other git commands.
-.IP "\(bu" 4
+.IP \(bu 4
 Fixes known rebase failures with \f(CW\*(C`git\-subtree\*(C'\fR.
-.SH "Installation"
+.SH Installation
 .IX Header "Installation"
 The best short answer is:
 .PP
@@ -174,10 +158,10 @@ The best short answer is:
 \&    echo \*(Aqsource /path/to/git\-subrepo/.rc\*(Aq >> ~/.bashrc
 .Ve
 .PP
-The complete \*(L"Installation Instructions\*(R" can be found below.
+The complete "Installation Instructions" can be found below.
 .PP
-Note: git-subrepo needs a git version (> 2.5) that supports worktree:s.
-.SH "Commands"
+Note: git-subrepo needs a git version (> 2.7) that supports worktree:s.
+.SH Commands
 .IX Header "Commands"
 All the \fBsubrepo\fR commands use names of actual Git commands and try to do
 operations that are similar to their Git counterparts. They also attempt to
@@ -186,9 +170,9 @@ experienced Git users.
 .PP
 Please note that the commands are \fInot\fR exact equivalents, and do not take
 all the same arguments. Keep reading…
-.ie n .IP """git subrepo clone <repository> [<subdir>] [\-b <branch>] [\-f] [\-m <msg>] [\-e] [\-\-method <merge|rebase>]""" 4
-.el .IP "\f(CWgit subrepo clone <repository> [<subdir>] [\-b <branch>] [\-f] [\-m <msg>] [\-e] [\-\-method <merge|rebase>]\fR" 4
-.IX Item "git subrepo clone <repository> [<subdir>] [-b <branch>] [-f] [-m <msg>] [-e] [--method <merge|rebase>]"
+.ie n .IP """git subrepo clone <repository> [<subdir>] [\-b <branch>] [\-f] [\-m <msg>] [\-\-file=<msg file>] [\-e] [\-\-method <merge|rebase>]""" 4
+.el .IP "\f(CWgit subrepo clone <repository> [<subdir>] [\-b <branch>] [\-f] [\-m <msg>] [\-\-file=<msg file>] [\-e] [\-\-method <merge|rebase>]\fR" 4
+.IX Item "git subrepo clone <repository> [<subdir>] [-b <branch>] [-f] [-m <msg>] [--file=<msg file>] [-e] [--method <merge|rebase>]"
 Add a repository as a subrepo in a subdir of your repository.
 .Sp
 This is similar in feel to \f(CW\*(C`git clone\*(C'\fR. You just specify the remote repo url,
@@ -204,13 +188,13 @@ All subsequent commands refer to the subrepo by the name of the
 \&\fIsubdir\fR. From the subdir, all the current information about the subrepo
 can be obtained.
 .Sp
-The \f(CW\*(C`\-\-force\*(C'\fR option will \*(L"reclone\*(R" (completely replace) an existing subdir.
+The \f(CW\*(C`\-\-force\*(C'\fR option will "reclone" (completely replace) an existing subdir.
 .Sp
 The \f(CW\*(C`\-\-method\*(C'\fR option will decide how the join process between branches are
 performed. The default option is merge.
 .Sp
-The \f(CW\*(C`clone\*(C'\fR command accepts the \f(CW\*(C`\-\-branch=\*(C'\fR \f(CW\*(C`\-\-edit\*(C'\fR, \f(CW\*(C`\-\-force\*(C'\fR and \f(CW\*(C`\-\-
-message=\*(C'\fR options.
+The \f(CW\*(C`clone\*(C'\fR command accepts the \f(CW\*(C`\-\-branch=\*(C'\fR \f(CW\*(C`\-\-edit\*(C'\fR, \f(CW\*(C`\-\-file\*(C'\fR, \f(CW\*(C`\-\-force\*(C'\fR
+and \f(CW\*(C`\-\-message=\*(C'\fR options.
 .ie n .IP """git subrepo init <subdir> [\-r <remote>] [\-b <branch>] [\-\-method <merge|rebase>]""" 4
 .el .IP "\f(CWgit subrepo init <subdir> [\-r <remote>] [\-b <branch>] [\-\-method <merge|rebase>]\fR" 4
 .IX Item "git subrepo init <subdir> [-r <remote>] [-b <branch>] [--method <merge|rebase>]"
@@ -219,13 +203,13 @@ Turn an existing subdirectory into a subrepo.
 If you want to expose a subdirectory of your project as a published subrepo,
 this command will do that. It will split out the content of a normal
 subdirectory into a branch and start tracking it as a subrepo. Afterwards your
-original repo will look exactly the same except that there will be a \f(CW\*(C`<subdir>/.gitrepo\*(C'\fR file.
+original repo will look exactly the same except that there will be a \f(CW\*(C`<<subdir\*(C'\fR/.gitrepo >> file.
 .Sp
 If you specify the \f(CW\*(C`\-\-remote\*(C'\fR (and optionally the \f(CW\*(C`\-\-branch\*(C'\fR) option, the
 values will be added to the \f(CW\*(C`<subdir>/.gitrepo\*(C'\fR file. The \f(CW\*(C`\-\-remote\*(C'\fR
-option is the upstream \s-1URL,\s0 and the \f(CW\*(C`\-\-branch\*(C'\fR option is the upstream branch
+option is the upstream URL, and the \f(CW\*(C`\-\-branch\*(C'\fR option is the upstream branch
 to push to. These values will be needed to do a \f(CW\*(C`git subrepo push\*(C'\fR command,
-but they can be provided later on the \f(CW\*(C`push\*(C'\fR command (and saved to \f(CW\*(C`<subdir>/.gitrepo\*(C'\fR if you also specify the \f(CW\*(C`\-\-update\*(C'\fR option).
+but they can be provided later on the \f(CW\*(C`push\*(C'\fR command (and saved to \f(CW\*(C`<<subdir\*(C'\fR/.gitrepo >> if you also specify the \f(CW\*(C`\-\-update\*(C'\fR option).
 .Sp
 Note: You will need to create the empty upstream repo and push to it on your
       own, using \f(CW\*(C`git subrepo push <subdir>\*(C'\fR.
@@ -234,9 +218,9 @@ The \f(CW\*(C`\-\-method\*(C'\fR option will decide how the join process between
 performed. The default option is merge.
 .Sp
 The \f(CW\*(C`init\*(C'\fR command accepts the \f(CW\*(C`\-\-branch=\*(C'\fR and \f(CW\*(C`\-\-remote=\*(C'\fR options.
-.ie n .IP """git subrepo pull <subdir>|\-\-all [\-M|\-R|\-f] [\-m <msg>] [\-e] [\-b <branch>] [\-r <remote>] [\-u]""" 4
-.el .IP "\f(CWgit subrepo pull <subdir>|\-\-all [\-M|\-R|\-f] [\-m <msg>] [\-e] [\-b <branch>] [\-r <remote>] [\-u]\fR" 4
-.IX Item "git subrepo pull <subdir>|--all [-M|-R|-f] [-m <msg>] [-e] [-b <branch>] [-r <remote>] [-u]"
+.ie n .IP """git subrepo pull <subdir>|\-\-all [\-M|\-R|\-f] [\-m <msg>] [\-\-file=<msg file>] [\-e] [\-b <branch>] [\-r <remote>] [\-u]""" 4
+.el .IP "\f(CWgit subrepo pull <subdir>|\-\-all [\-M|\-R|\-f] [\-m <msg>] [\-\-file=<msg file>] [\-e] [\-b <branch>] [\-r <remote>] [\-u]\fR" 4
+.IX Item "git subrepo pull <subdir>|--all [-M|-R|-f] [-m <msg>] [--file=<msg file>] [-e] [-b <branch>] [-r <remote>] [-u]"
 Update the subrepo subdir with the latest upstream changes.
 .Sp
 The \f(CW\*(C`pull\*(C'\fR command fetches the latest content from the remote branch pointed
@@ -274,10 +258,6 @@ When you pull you can assume a fast-forward strategy (default) or you can
 specify a \f(CW\*(C`\-\-rebase\*(C'\fR, \f(CW\*(C`\-\-merge\*(C'\fR or \f(CW\*(C`\-\-force\*(C'\fR strategy. The latter is the
 same as a \f(CW\*(C`clone \-\-force\*(C'\fR operation, using the current remote and branch.
 .Sp
-When you pull you can assume a fast-forward strategy (default) or you can
-specify a \f(CW\*(C`\-\-rebase\*(C'\fR, \f(CW\*(C`\-\-merge\*(C'\fR or \f(CW\*(C`\-\-force\*(C'\fR strategy. The latter is the
-same as a \f(CW\*(C`clone \-\-force\*(C'\fR operation, using the current remote and branch.
-.Sp
 Like the \f(CW\*(C`clone\*(C'\fR command, \f(CW\*(C`pull\*(C'\fR will squash all the changes (since the last
 pull or clone) into one commit. This keeps your mainline history nice and
 clean. You can easily see the subrepo's history with the \f(CW\*(C`git log\*(C'\fR command:
@@ -288,11 +268,11 @@ clean. You can easily see the subrepo's history with the \f(CW\*(C`git log\*(C'\
 .Sp
 The set of commands used above are described in detail below.
 .Sp
-The \f(CW\*(C`pull\*(C'\fR command accepts the \f(CW\*(C`\-\-all\*(C'\fR, \f(CW\*(C`\-\-branch=\*(C'\fR, \f(CW\*(C`\-\-edit\*(C'\fR, \f(CW\*(C`\-\-force\*(C'\fR,
-\&\f(CW\*(C`\-\-message=\*(C'\fR, \f(CW\*(C`\-\-remote=\*(C'\fR and \f(CW\*(C`\-\-update\*(C'\fR options.
-.ie n .IP """git subrepo push <subdir>|\-\-all [<branch>] [\-r <remote>] [\-b <branch>] [\-M|\-R] [\-u] [\-f] [\-s] [\-N]""" 4
-.el .IP "\f(CWgit subrepo push <subdir>|\-\-all [<branch>] [\-r <remote>] [\-b <branch>] [\-M|\-R] [\-u] [\-f] [\-s] [\-N]\fR" 4
-.IX Item "git subrepo push <subdir>|--all [<branch>] [-r <remote>] [-b <branch>] [-M|-R] [-u] [-f] [-s] [-N]"
+The \f(CW\*(C`pull\*(C'\fR command accepts the \f(CW\*(C`\-\-all\*(C'\fR, \f(CW\*(C`\-\-branch=\*(C'\fR, \f(CW\*(C`\-\-edit\*(C'\fR, \f(CW\*(C`\-\-file\*(C'\fR,
+\&\f(CW\*(C`\-\-force\*(C'\fR, \f(CW\*(C`\-\-message=\*(C'\fR, \f(CW\*(C`\-\-remote=\*(C'\fR and \f(CW\*(C`\-\-update\*(C'\fR options.
+.ie n .IP """git subrepo push <subdir>|\-\-all [<branch>] [\-m msg] [\-\-file=<msg file>] [\-r <remote>] [\-b <branch>] [\-M|\-R] [\-u] [\-f] [\-s] [\-N]""" 4
+.el .IP "\f(CWgit subrepo push <subdir>|\-\-all [<branch>] [\-m msg] [\-\-file=<msg file>] [\-r <remote>] [\-b <branch>] [\-M|\-R] [\-u] [\-f] [\-s] [\-N]\fR" 4
+.IX Item "git subrepo push <subdir>|--all [<branch>] [-m msg] [--file=<msg file>] [-r <remote>] [-b <branch>] [-M|-R] [-u] [-f] [-s] [-N]"
 Push a properly merged subrepo branch back upstream.
 .Sp
 This command takes the subrepo branch from a successful pull command and
@@ -301,26 +281,24 @@ the \f(CW\*(C`branch\*(C'\fR command and merge things yourself before pushing if
 (although that is probably a rare use case).
 .Sp
 The \f(CW\*(C`push\*(C'\fR command requires a branch that has been properly merged/rebased
-with the upstream \s-1HEAD\s0 (unless the upstream \s-1HEAD\s0 is empty, which is common
-when doing a first \f(CW\*(C`push\*(C'\fR after an \f(CW\*(C`init\*(C'\fR). That means the upstream \s-1HEAD\s0 is
+with the upstream HEAD (unless the upstream HEAD is empty, which is common
+when doing a first \f(CW\*(C`push\*(C'\fR after an \f(CW\*(C`init\*(C'\fR). That means the upstream HEAD is
 one of the commits in the branch.
 .Sp
 By default the branch ref \f(CW\*(C`refs/subrepo/<subdir>/pull\*(C'\fR will be pushed,
 but you can specify a (properly merged) branch to push.
 .Sp
 After that, the \f(CW\*(C`push\*(C'\fR command just checks that the branch contains the
-upstream \s-1HEAD\s0 and then pushes it upstream.
+upstream HEAD and then pushes it upstream.
 .Sp
 The \f(CW\*(C`\-\-force\*(C'\fR option will do a force push. Force pushes are typically
 discouraged. Only use this option if you fully understand it. (The \f(CW\*(C`\-\-force\*(C'\fR
-option will \s-1NOT\s0 check for a proper merge. \s-1ANY\s0 branch will be force pushed!)
-.Sp
-The \f(CW\*(C`push\*(C'\fR command accepts the \f(CW\*(C`\-\-all\*(C'\fR, \f(CW\*(C`\-\-branch=\*(C'\fR, \f(CW\*(C`\-\-dry\-run\*(C'\fR, \f(CW\*(C`\-\-
-force\*(C'\fR, \f(CW\*(C`\-\-merge\*(C'\fR, \f(CW\*(C`\-\-rebase\*(C'\fR, \f(CW\*(C`\-\-remote=\*(C'\fR, \f(CW\*(C`\-\-squash\*(C'\fR and \f(CW\*(C`\-\-
-update\*(C'\fR options.
-.ie n .IP """git subrepo fetch <subdir>|\-\-all [\-r <remote>] [\-b <branch>]""" 4
-.el .IP "\f(CWgit subrepo fetch <subdir>|\-\-all [\-r <remote>] [\-b <branch>]\fR" 4
-.IX Item "git subrepo fetch <subdir>|--all [-r <remote>] [-b <branch>]"
+option will NOT check for a proper merge. ANY branch will be force pushed!)
+.Sp
+The \f(CW\*(C`push\*(C'\fR command accepts the \f(CW\*(C`\-\-all\*(C'\fR, \f(CW\*(C`\-\-branch=\*(C'\fR, \f(CW\*(C`\-\-dry\-run\*(C'\fR, \f(CW\*(C`\-\-file\*(C'\fR, \f(CW\*(C`\-\-force\*(C'\fR, \f(CW\*(C`\-\-merge\*(C'\fR, \f(CW\*(C`\-\-message\*(C'\fR, \f(CW\*(C`\-\-rebase\*(C'\fR, \f(CW\*(C`\-\-remote=\*(C'\fR, \f(CW\*(C`\-\-squash\*(C'\fR and \f(CW\*(C`\-\-update\*(C'\fR options.
+.ie n .IP """git subrepo fetch <subdir>|\-\-force \-\-all [\-r <remote>] [\-b <branch>]""" 4
+.el .IP "\f(CWgit subrepo fetch <subdir>|\-\-force \-\-all [\-r <remote>] [\-b <branch>]\fR" 4
+.IX Item "git subrepo fetch <subdir>|--force --all [-r <remote>] [-b <branch>]"
 Fetch the remote/upstream content for a subrepo.
 .Sp
 It will create a Git reference called \f(CW\*(C`subrepo/<subdir>/fetch\*(C'\fR that
@@ -328,8 +306,7 @@ points at the same commit as \f(CW\*(C`FETCH_HEAD\*(C'\fR. It will also create a
 called \f(CW\*(C`subrepo/<subdir>\*(C'\fR. These are temporary and you can easily remove
 them with the subrepo \f(CW\*(C`clean\*(C'\fR command.
 .Sp
-The \f(CW\*(C`fetch\*(C'\fR command accepts the \f(CW\*(C`\-\-all\*(C'\fR, \f(CW\*(C`\-\-branch=\*(C'\fR and \f(CW\*(C`\-\-
-remote=\*(C'\fR options.
+The \f(CW\*(C`fetch\*(C'\fR command accepts the \f(CW\*(C`\-\-force\*(C'\fR, \f(CW\*(C`\-\-all\*(C'\fR, \f(CW\*(C`\-\-branch=\*(C'\fR and \f(CW\*(C`\-\-remote=\*(C'\fR options.
 .ie n .IP """git subrepo branch <subdir>|\-\-all [\-f] [\-F]""" 4
 .el .IP "\f(CWgit subrepo branch <subdir>|\-\-all [\-f] [\-F]\fR" 4
 .IX Item "git subrepo branch <subdir>|--all [-f] [-F]"
@@ -343,32 +320,30 @@ This is useful for doing \f(CW\*(C`pull\*(C'\fR and \f(CW\*(C`push\*(C'\fR comma
 Use the \f(CW\*(C`\-\-force\*(C'\fR option to write over an existing \f(CW\*(C`subrepo/<subdir>\*(C'\fR branch.
 .Sp
 The \f(CW\*(C`branch\*(C'\fR command accepts the \f(CW\*(C`\-\-all\*(C'\fR, \f(CW\*(C`\-\-fetch\*(C'\fR and \f(CW\*(C`\-\-force\*(C'\fR options.
-.ie n .IP """git subrepo commit <subdir> [<subrepo\-ref>] [\-m <msg>] [\-e] [\-f] [\-F]""" 4
-.el .IP "\f(CWgit subrepo commit <subdir> [<subrepo\-ref>] [\-m <msg>] [\-e] [\-f] [\-F]\fR" 4
-.IX Item "git subrepo commit <subdir> [<subrepo-ref>] [-m <msg>] [-e] [-f] [-F]"
+.ie n .IP """git subrepo commit <subdir> [<subrepo\-ref>] [\-m <msg>] [\-\-file=<msg file>] [\-e] [\-f] [\-F]""" 4
+.el .IP "\f(CWgit subrepo commit <subdir> [<subrepo\-ref>] [\-m <msg>] [\-\-file=<msg file>] [\-e] [\-f] [\-F]\fR" 4
+.IX Item "git subrepo commit <subdir> [<subrepo-ref>] [-m <msg>] [--file=<msg file>] [-e] [-f] [-F]"
 Add subrepo branch to current history as a single commit.
 .Sp
-This command is generally used after a hand-merge. You have done a \f(CW\*(C`subrepo
-branch\*(C'\fR and merged (rebased) it with the upstream. This command takes the \s-1HEAD\s0
+This command is generally used after a hand-merge. You have done a \f(CW\*(C`subrepobranch\*(C'\fR and merged (rebased) it with the upstream. This command takes the HEAD
 of that branch, puts its content into the subrepo subdir and adds a new commit
 for it to the top of your mainline history.
 .Sp
-This command requires that the upstream \s-1HEAD\s0 be in the \f(CW\*(C`subrepo/<subdir>\*(C'\fR
+This command requires that the upstream HEAD be in the \f(CW\*(C`subrepo/<subdir>\*(C'\fR
 branch history. That way the same branch can push upstream. Use the \f(CW\*(C`\-\-force\*(C'\fR
 option to commit anyway.
 .Sp
-The \f(CW\*(C`commit\*(C'\fR command accepts the \f(CW\*(C`\-\-edit\*(C'\fR, \f(CW\*(C`\-\-fetch\*(C'\fR, \f(CW\*(C`\-\-force\*(C'\fR and \f(CW\*(C`\-\-
-message=\*(C'\fR options.
+The \f(CW\*(C`commit\*(C'\fR command accepts the \f(CW\*(C`\-\-edit\*(C'\fR, \f(CW\*(C`\-\-fetch\*(C'\fR, \f(CW\*(C`\-\-file\*(C'\fR, \f(CW\*(C`\-\-force\*(C'\fR
+and \f(CW\*(C`\-\-message=\*(C'\fR options.
 .ie n .IP """git subrepo status [<subdir>|\-\-all|\-\-ALL] [\-F] [\-q|\-v]""" 4
 .el .IP "\f(CWgit subrepo status [<subdir>|\-\-all|\-\-ALL] [\-F] [\-q|\-v]\fR" 4
 .IX Item "git subrepo status [<subdir>|--all|--ALL] [-F] [-q|-v]"
-Get the status of a subrepo. Uses the \f(CW\*(C`\-\-all\*(C'\fR option by default. If the \f(CW\*(C`\-\-
-quiet\*(C'\fR flag is used, just print the subrepo names, one per line.
+Get the status of a subrepo. Uses the \f(CW\*(C`\-\-all\*(C'\fR option by default. If the \f(CW\*(C`\-\-quiet\*(C'\fR flag is used, just print the subrepo names, one per line.
 .Sp
 The \f(CW\*(C`\-\-verbose\*(C'\fR option will show all the recent local and upstream commits.
 .Sp
 Use \f(CW\*(C`\-\-ALL\*(C'\fR to show the subrepos of the subrepos (ie the
-\&\*(L"subsubrepos\*(R"), if any.
+"subsubrepos"), if any.
 .Sp
 The \f(CW\*(C`status\*(C'\fR command accepts the \f(CW\*(C`\-\-all\*(C'\fR, \f(CW\*(C`\-\-ALL\*(C'\fR, \f(CW\*(C`\-\-fetch\*(C'\fR, \f(CW\*(C`\-\-quiet\*(C'\fR
 and \f(CW\*(C`\-\-verbose\*(C'\fR options.
@@ -388,7 +363,7 @@ Use \f(CW\*(C`\-\-all\*(C'\fR to clean up after all the current subrepos. Someti
 change to a branch where a subrepo doesn't exist, and then \f(CW\*(C`\-\-all\*(C'\fR won't find
 it. Use \f(CW\*(C`\-\-ALL\*(C'\fR to remove any artifacts that were ever created by subrepo.
 .Sp
-To remove \s-1ALL\s0 subrepo artifacts:
+To remove ALL subrepo artifacts:
 .Sp
 .Vb 1
 \&    git subrepo clean \-\-ALL \-\-force
@@ -415,8 +390,8 @@ Example to update the \f(CW\*(C`method\*(C'\fR option for a subrepo:
 Same as \f(CW\*(C`git help subrepo\*(C'\fR. Will launch the manpage. For the shorter usage,
 use \f(CW\*(C`git subrepo \-h\*(C'\fR.
 .Sp
-Use \f(CW\*(C`git subrepo help <command> to get help for a specific command. Use\*(C'\fR\-\-
-all` to get a summary of all commands.
+Use \f(CW\*(C`git subrepo help <command>\*(C'\fR to get help for a specific command. Use
+\&\f(CW\*(C`\-\-all\*(C'\fR to get a summary of all commands.
 .Sp
 The \f(CW\*(C`help\*(C'\fR command accepts the \f(CW\*(C`\-\-all\*(C'\fR option.
 .ie n .IP """git subrepo version [\-q|\-v]""" 4
@@ -438,15 +413,15 @@ latest code.
 .SH "Command Options"
 .IX Header "Command Options"
 .ie n .IP """\-h""" 4
-.el .IP "\f(CW\-h\fR" 4
+.el .IP \f(CW\-h\fR 4
 .IX Item "-h"
 Show a brief view of the commands and options.
 .ie n .IP """\-\-help""" 4
-.el .IP "\f(CW\-\-help\fR" 4
+.el .IP \f(CW\-\-help\fR 4
 .IX Item "--help"
 Gives an overview of the help options available for the subrepo command.
 .ie n .IP """\-\-version""" 4
-.el .IP "\f(CW\-\-version\fR" 4
+.el .IP \f(CW\-\-version\fR 4
 .IX Item "--version"
 Print the git-subrepo version. Just the version number. Try the \f(CW\*(C`version\*(C'\fR
 command for more version info.
@@ -459,12 +434,12 @@ applicable).
 .el .IP "\f(CW\-\-ALL\fR (\f(CW\-A\fR)" 4
 .IX Item "--ALL (-A)"
 If you have subrepos that also have subrepos themselves, issue the command to
-\&\s-1ALL\s0 of them. Note that the \f(CW\*(C`\-\-ALL\*(C'\fR option only works for a subset of the
+ALL of them. Note that the \f(CW\*(C`\-\-ALL\*(C'\fR option only works for a subset of the
 commands that \f(CW\*(C`\-\-all\*(C'\fR works for.
 .ie n .IP """\-\-branch=<branch\-name>"" (""\-b <branch\-name>"")" 4
 .el .IP "\f(CW\-\-branch=<branch\-name>\fR (\f(CW\-b <branch\-name>\fR)" 4
 .IX Item "--branch=<branch-name> (-b <branch-name>)"
-Use a different upstream branch-name than the remote \s-1HEAD\s0 or the one saved in
+Use a different upstream branch-name than the remote HEAD or the one saved in
 \&\f(CW\*(C`.gitrepo\*(C'\fR locally.
 .ie n .IP """\-\-dry\-run"" (""\-N"")" 4
 .el .IP "\f(CW\-\-dry\-run\fR (\f(CW\-N\fR)" 4
@@ -479,12 +454,16 @@ Edit the commit message before committing.
 .el .IP "\f(CW\-\-fetch\fR (\f(CW\-F\fR)" 4
 .IX Item "--fetch (-F)"
 Use this option to fetch the upstream commits, before running the command.
+.ie n .IP """\-\-file=<commit msg file>""" 4
+.el .IP "\f(CW\-\-file=<commit msg file>\fR" 4
+.IX Item "--file=<commit msg file>"
+Supply your own commit message from a file
 .ie n .IP """\-\-force"" (""\-f"")" 4
 .el .IP "\f(CW\-\-force\fR (\f(CW\-f\fR)" 4
 .IX Item "--force (-f)"
 Use this option to force certain commands that fail in the general case.
 .Sp
-\&\s-1NOTE:\s0 The \f(CW\*(C`\-\-force\*(C'\fR option means different things for different commands.
+NOTE: The \f(CW\*(C`\-\-force\*(C'\fR option means different things for different commands.
       Read the command specific doc for the exact meaning.
 .ie n .IP """\-\-merge"" (""\-M"")" 4
 .el .IP "\f(CW\-\-merge\fR (\f(CW\-M\fR)" 4
@@ -533,42 +512,41 @@ Applicable to most commands.
 .el .IP "\f(CW\-\-DEBUG\fR (\f(CW\-x\fR)" 4
 .IX Item "--DEBUG (-x)"
 Use the Bash \f(CW\*(C`set \-x\*(C'\fR option which prints every command before it is
-run. \s-1VERY\s0 noisy, but extremely useful in deep debugging. Applicable to
+run. VERY noisy, but extremely useful in deep debugging. Applicable to
 all commands.
 .SH "Environment Variables"
 .IX Header "Environment Variables"
 The \f(CW\*(C`git\-subrepo\*(C'\fR command exports and honors some environment variables:
 .ie n .IP """GIT_SUBREPO_ROOT""" 4
-.el .IP "\f(CWGIT_SUBREPO_ROOT\fR" 4
+.el .IP \f(CWGIT_SUBREPO_ROOT\fR 4
 .IX Item "GIT_SUBREPO_ROOT"
-This is set by the \f(CW\*(C`.rc\*(C'\fR file, if you use that method to install / enable \f(CW\*(C`git\-
-subrepo\*(C'\fR. It contains the path of the \f(CW\*(C`git\-subrepo\*(C'\fR repository.
+This is set by the \f(CW\*(C`.rc\*(C'\fR file, if you use that method to install / enable \f(CW\*(C`git\-subrepo\*(C'\fR. It contains the path of the \f(CW\*(C`git\-subrepo\*(C'\fR repository.
 .ie n .IP """GIT_SUBREPO_RUNNING""" 4
-.el .IP "\f(CWGIT_SUBREPO_RUNNING\fR" 4
+.el .IP \f(CWGIT_SUBREPO_RUNNING\fR 4
 .IX Item "GIT_SUBREPO_RUNNING"
 This variable is exported when \f(CW\*(C`git\-subrepo\*(C'\fR is running. It is set to the pid
 of the \f(CW\*(C`git\-subrepo\*(C'\fR process that is running. Other processes, like git hooks
 for instance, can use this information to adjust accordingly.
 .ie n .IP """GIT_SUBREPO_COMMAND""" 4
-.el .IP "\f(CWGIT_SUBREPO_COMMAND\fR" 4
+.el .IP \f(CWGIT_SUBREPO_COMMAND\fR 4
 .IX Item "GIT_SUBREPO_COMMAND"
 This variable is exported when \f(CW\*(C`git\-subrepo\*(C'\fR is running. It is set to the
 name of the \f(CW\*(C`git\-subrepo\*(C'\fR subcommand that is running.
 .ie n .IP """GIT_SUBREPO_PAGER""" 4
-.el .IP "\f(CWGIT_SUBREPO_PAGER\fR" 4
+.el .IP \f(CWGIT_SUBREPO_PAGER\fR 4
 .IX Item "GIT_SUBREPO_PAGER"
 Use this to specify the pager to use for long output commands. Defaults to
 \&\f(CW$PAGER\fR or \f(CW\*(C`less\*(C'\fR.
 .ie n .IP """GIT_SUBREPO_QUIET""" 4
-.el .IP "\f(CWGIT_SUBREPO_QUIET\fR" 4
+.el .IP \f(CWGIT_SUBREPO_QUIET\fR 4
 .IX Item "GIT_SUBREPO_QUIET"
 Set this for quiet (\f(CW\*(C`\-q\*(C'\fR) output.
 .ie n .IP """GIT_SUBREPO_VERBOSE""" 4
-.el .IP "\f(CWGIT_SUBREPO_VERBOSE\fR" 4
+.el .IP \f(CWGIT_SUBREPO_VERBOSE\fR 4
 .IX Item "GIT_SUBREPO_VERBOSE"
 Set this for verbose (\f(CW\*(C`\-v\*(C'\fR) output.
 .ie n .IP """GIT_SUBREPO_DEBUG""" 4
-.el .IP "\f(CWGIT_SUBREPO_DEBUG\fR" 4
+.el .IP \f(CWGIT_SUBREPO_DEBUG\fR 4
 .IX Item "GIT_SUBREPO_DEBUG"
 Set this for debugging (\f(CW\*(C`\-d\*(C'\fR) output.
 .SH "Installation Instructions"
@@ -610,18 +588,18 @@ to your other git commands:
 .Ve
 .PP
 This method does not account for upgrading and command completion yet.
-.SS "Windows"
+.SS Windows
 .IX Subsection "Windows"
 This command is known to work in these Windows environments:
-.IP "\(bu" 4
-Git for Windows \*(-- <https://git\-for\-windows.github.io/>
-.IP "\(bu" 4
-Babun \*(-- <http://babun.github.io/>
-.IP "\(bu" 4
-Cygwin \*(-- <https://www.cygwin.com/>
+.IP \(bu 4
+Git for Windows \-\- <https://git\-for\-windows.github.io/>
+.IP \(bu 4
+Babun \-\- <http://babun.github.io/>
+.IP \(bu 4
+Cygwin \-\- <https://www.cygwin.com/>
 .PP
 Let us know if there are others that it works (or doesn't work) in.
-.SH "Testing"
+.SH Testing
 .IX Header "Testing"
 The \f(CW\*(C`git\-subrepo\*(C'\fR repository comes with a extensive test suite. You can
 run it with:
@@ -635,7 +613,7 @@ or if you don't have \f(CW\*(C`make\*(C'\fR on your system:
 .Vb 1
 \&    prove \-v test
 .Ve
-.SH "Upgrading"
+.SH Upgrading
 .IX Header "Upgrading"
 If you used the \f(CW\*(C`.rc\*(C'\fR or \f(CW\*(C`PATH\*(C'\fR method of installation, just run this to
 upgrade \f(CW\*(C`git\-subrepo\*(C'\fR:
@@ -672,17 +650,17 @@ need to enable that first:
 .PP
 On your system, the Git completion script might be found at any of the
 following locations (or somewhere else that we don't know about):
-.IP "\(bu" 4
+.IP \(bu 4
 \&\f(CW\*(C`/etc/bash_completion.d/git\*(C'\fR
-.IP "\(bu" 4
+.IP \(bu 4
 \&\f(CW\*(C`/usr/share/bash\-completion/git\*(C'\fR
-.IP "\(bu" 4
+.IP \(bu 4
 \&\f(CW\*(C`/usr/share/bash\-completion/completions/git\*(C'\fR
-.IP "\(bu" 4
+.IP \(bu 4
 \&\f(CW\*(C`/opt/local/share/bash\-completion/completions/git\*(C'\fR
-.IP "\(bu" 4
+.IP \(bu 4
 \&\f(CW\*(C`/usr/local/etc/bash_completion.d/git\*(C'\fR
-.IP "\(bu" 4
+.IP \(bu 4
 \&\f(CW\*(C`~/.homebrew/etc/bash_completion.d/git\*(C'\fR
 .PP
 In case you can't find any of these, this repository contains a copy of the
@@ -707,10 +685,10 @@ function is called:
 .Vb 1
 \&    fpath=(\*(Aq/path/to/git\-subrepo/share/zsh\-completion\*(Aq $fpath)
 .Ve
-.SH "Status"
+.SH Status
 .IX Header "Status"
-The git-subrepo command has been in use for well over a year and seems to get
-the job done. Development is still ongoing but mostly just for fixing bugs.
+The git-subrepo command has been used in production and seems to get the job
+done. Development is still ongoing but mostly just for fixing bugs.
 .PP
 Trying subrepo out is simple and painless (this is not \f(CW\*(C`git submodule\*(C'\fR).
 Nothing is permanent (if you do not push to shared remotes). ie You can always
@@ -722,26 +700,96 @@ issues on anything that seems wrong.
 .PP
 If you want to chat about the \f(CW\*(C`git\-subrepo\*(C'\fR command, join \f(CW\*(C`#gitcommands\*(C'\fR on
 \&\f(CW\*(C`irc.freenode.net\*(C'\fR.
-.SH "Notes"
+.SH Notes
 .IX Header "Notes"
-.IP "\(bu" 4
-Works on \s-1POSIX\s0 systems: Linux, \s-1BSD, OSX,\s0 etc.
-.IP "\(bu" 4
-Works on various Windows environments. See \*(L"Windows\*(R" section above.
-.IP "\(bu" 4
+.IP \(bu 4
+Works on POSIX systems: Linux, BSD, OSX, etc.
+.IP \(bu 4
+Works on various Windows environments. See "Windows" section above.
+.IP \(bu 4
 The \f(CW\*(C`git\-subrepo\*(C'\fR repo itself has 2 subrepos under the \f(CW\*(C`ext/\*(C'\fR subdirectory.
-.IP "\(bu" 4
+.IP \(bu 4
 Written in (very modern) Bash, with full test suite. Take a look.
-.IP "\(bu" 4
+.IP \(bu 4
 A \f(CW\*(C`.gitrepo\*(C'\fR file never is in the top level dir (next to a \f(CW\*(C`.git/\*(C'\fR dir).
-.SH "Authors"
+.SH "Working with nested subrepos"
+.IX Header "Working with nested subrepos"
+\&\f(CW\*(C`git\-subrepo\*(C'\fR supports adding subrepos which themselves make use of subrepos.
+In fact, subrepo itself is built this way. Take a look in the \f(CW\*(C`ext/\*(C'\fR folder,
+it houses 2 dependencies as subrepos, \f(CW\*(C`test\-more\-bash\*(C'\fR and \f(CW\*(C`bashplus\*(C'\fR.
+.PP
+\&\f(CW\*(C`test\-more\-bash\*(C'\fR itself depends on 2 more subrepos: \f(CW\*(C`bashplus\*(C'\fR again, and
+\&\f(CW\*(C`test\-tap\-bash\*(C'\fR.
+.PP
+The structure is therefore as follows:
+.PP
+.Vb 5
+\&    git\-subrepo
+\&      |\- bashplus
+\&      |\- test\-more\-bash
+\&        |\- bashplus
+\&        |\- test\-tap\-bash
+.Ve
+.PP
+However, it's important to understand how this works. Here's the key idea:
+There is \fBno\fR special handling for nested subrepos.
+.PP
+When you clone a subrepo, \fBall\fR \f(CW\*(C`git\-subrepo\*(C'\fR does is download the code and
+set up the subrepo file. This means that all the subrepo commands simply act
+on the subrepo as a whole, treating nested subrepos like any other part of the
+source code.
+.PP
+Let's look at what this means in practice. Say you have a structure as
+follows:
+.PP
+.Vb 3
+\&    app\-foo
+\&      |\- barlib
+\&         |\- bazlib
+.Ve
+.PP
+You're working on app-foo, and make some changes to bazlib. How should you
+upstream these changes?
+.PP
+From the perspective of app-foo, you've simply made some changes to barlib.
+Whether or not those changes were themselves in a subrepo is irrelevant. So,
+just like any other changes, you run
+.PP
+\&\f(CW\*(C`git subrepo push barlib\*(C'\fR
+.PP
+Now, if \f(CW\*(C`barlib\*(C'\fR is a library you don't maintain, your responsibility would
+end here. \f(CW\*(C`barlib\*(C'\fR's maintainer would see your changes and decide what to do
+with them.
+.PP
+If you do maintain \f(CW\*(C`barlib\*(C'\fR, you might now want to upstream the changes all
+the way into \f(CW\*(C`bazlib\*(C'\fR. You could be tempted to try running something like:
+.PP
+\&\f(CW\*(C`git subrepo push barlib/bazlib\*(C'\fR
+.PP
+but you'll soon find out that doesn't work. \f(CW\*(C`app\-foo\*(C'\fR doesn't know anything
+about the link between \f(CW\*(C`barlib\*(C'\fR and \f(CW\*(C`bazlib\*(C'\fR.
+.PP
+What you should do is treat the changes to \f(CW\*(C`barlib\*(C'\fR as if they would come
+from another contributor, aka:
+.IP \(bu 4
+go to a local copy of \f(CW\*(C`barlib\*(C'\fR
+.IP \(bu 4
+pull down the changes with \f(CW\*(C`git pull\*(C'\fR
+.IP \(bu 4
+you notice the changes include some work on your subrepo, time to upstream them: \f(CW\*(C`git subrepo push bazlib\*(C'\fR
+.PP
+And you're done! One final step you'll likely want to do is to go back to \f(CW\*(C`app\-foo\*(C'\fR and run \f(CW\*(C`git subrepo pull barlib\*(C'\fR, because the push you just did added a
+new commit.
+.SH Authors
 .IX Header "Authors"
-.IP "\(bu" 4
+.IP \(bu 4
 Ingy döt Net <ingy@ingy.net>
-.IP "\(bu" 4
+.IP \(bu 4
 Magnus Carlsson <grimmymail@gmail.com>
+.IP \(bu 4
+Austin Morgan <admorgan@morgancomputers.net>
 .SH "License and Copyright"
 .IX Header "License and Copyright"
-The \s-1MIT\s0 License (\s-1MIT\s0)
+The MIT License (MIT)
 .PP
-Copyright (c) 2013\-2018 Ingy döt Net
+Copyright (c) 2013\-2024 Ingy döt Net
diff --git a/note/Cases b/note/Cases
index 06c500e6..f4a1ef84 100644
--- a/note/Cases
+++ b/note/Cases
@@ -26,7 +26,4 @@ art art/gallery$ git log
 A---B---C
        /
      Q'
-art art/gallery$ 
-
-
-
+art art/gallery$
diff --git a/note/Dags b/note/Dags
index 0481f98a..c82e2196 100644
--- a/note/Dags
+++ b/note/Dags
@@ -196,4 +196,3 @@
            \   /
             \ /
              A
-
diff --git a/note/Story1 b/note/Story1
index 0dd81ceb..ab4ad3a4 100644
--- a/note/Story1
+++ b/note/Story1
@@ -53,5 +53,3 @@ git subrepo branch ext/bashplus         # create refs/heads/subrepo/ext/bashplus
 git subrepo checkout ext/bashplus
 
 git subrepo push ext/bashplus
-
-
diff --git a/note/design2.swim b/note/design2.swim
index 90121187..8d50268b 100644
--- a/note/design2.swim
+++ b/note/design2.swim
@@ -82,4 +82,3 @@ There are certain steps that each command must do first:
 == Clone command:
 
 * Fetch upstream content for our tracking branch.
-
diff --git a/note/init-test b/note/init-test
deleted file mode 100755
index a20854de..00000000
--- a/note/init-test
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-set -ex
-cat $0    # Show this script in the output
-
-REPO=${1:-ingydotnet/djson-pm}
-REPODIR="${REPO#*/}"
-SUBDIR=${2:-test}
-SUBREPO=$REPO-$SUBDIR
-SUBREPODIR="${SUBREPO#*/}"
-
-git hub repo-delete "$SUBREPO" || true
-rm -fr "$REPODIR"
-git hub clone "$REPO"
-(
-  exit
-  cd "$REPODIR"
-  git subrepo init test -r "git@github.com:$SUBREPO" # -b foo
-  git hub repo-new "$SUBREPO"
-  git hub repo "$SUBREPO"
-  cat "$SUBDIR/.gitrepo"
-  git subrepo push "$SUBDIR"
-  git subrepo status "$SUBDIR"
-  git hub clone "$SUBREPO"
-  [[ -e "$SUBREPODIR/decode.t" ]] && echo PASS || echo FAIL
-)
-(
-  cd "$REPODIR"
-  git subrepo init test
-  git hub repo-new "$SUBREPO"
-  git hub repo "$SUBREPO"
-  cat "$SUBDIR/.gitrepo"
-  git subrepo push -u "$SUBDIR" -r "git@github.com:$SUBREPO" -b foo
-  git subrepo status "$SUBDIR"
-  git hub clone "$SUBREPO"
-  [[ -e "$SUBREPODIR/decode.t" ]] && echo PASS || echo FAIL
-  bash -i
-)
diff --git a/note/recreate-rebase-conflict.sh b/note/recreate-rebase-conflict.sh
old mode 100644
new mode 100755
diff --git a/note/subtree-rebase-fail-example/test.bash b/note/subtree-rebase-fail-example/test.bash
index df8b818c..c66adcf2 100755
--- a/note/subtree-rebase-fail-example/test.bash
+++ b/note/subtree-rebase-fail-example/test.bash
@@ -24,6 +24,6 @@ git clone repo1 repo3
   git subrepo clone ../repo2 subrepo
   bash
   git rebase -i HEAD^
-  git log -p 
+  git log -p
   ls
 )
diff --git a/note/test-subrepo-push.sh b/note/test-subrepo-push.sh
old mode 100644
new mode 100755
diff --git a/note/test.sh b/note/test.sh
index fae27879..1c4cf956 100755
--- a/note/test.sh
+++ b/note/test.sh
@@ -13,19 +13,19 @@ git clone "git@github.com:$repo" test-repo
 
 (
   # cd into test-repo
-  cd test-repo
+  cd test-repo || exit
   # Tag original head
   git tag o
   # Pick a commit in the middle of the commit history
   S=$(git rev-parse HEAD^^^^)
   # Reset to the middle commit
-  git reset --hard $S
+  git reset --hard "$S"
   # Tag that history as 'a'
   git tag a
   # Reset to original
   git reset --hard o
   # Take the tail of the history.
-  git filter-branch -f --parent-filter "sed 's/-p $S//'" $S..HEAD
+  git filter-branch -f --parent-filter "sed 's/-p $S//'" "$S..HEAD"
   # Mark that sequence as 'b'
   git tag b
   # Reset to a
diff --git a/pkg/bin/generate-completion.pl b/pkg/bin/generate-completion.pl
old mode 100644
new mode 100755
index 85ae3b8b..740a77b3
--- a/pkg/bin/generate-completion.pl
+++ b/pkg/bin/generate-completion.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
 use strict;
-use XXX;
+# use XXX;
 
 sub main {
     my ($cmd) = @_;
@@ -46,10 +46,15 @@ sub main {
     if ($cmd eq "bash") {
         generate_bash(\@list, \@subdir_cmds, \@options);
     }
-    else {
+    elsif ($cmd eq "zsh") {
         generate_zsh(\@list, \@subdir_cmds, \@options);
     }
-
+    elsif ($cmd eq "fish") {
+        generate_fish(\@list, \@subdir_cmds, \@options);
+    }
+    else {
+        die "Unknown shell: $cmd";
+    }
 }
 
 sub generate_zsh {
@@ -82,11 +87,6 @@ sub generate_zsh {
 
 # DO NOT EDIT. This file generated by pkg/bin/generate-completion.pl.
 
-if [[ -z $GIT_SUBREPO_ROOT ]]; then
-	echo 'GIT_SUBREPO_ROOT is null; has `/path/to/git-subrepo/.rc` been sourced?'
-	return 3
-fi
-
 _git-subrepo() {
     typeset -A opt_args
     local curcontext="$curcontext" state line context
@@ -144,6 +144,68 @@ sub generate_zsh {
 ...
 }
 
+sub generate_fish {
+    my ($list, $subdir_cmds, $options) = @_;
+
+    print <<'...';
+# DO NOT EDIT. This file generated by pkg/bin/generate-completion.pl.
+
+function __fish_git_subrepo_subdirs
+    git subrepo status -q
+end
+
+complete -c git-subrepo -f
+...
+
+    # Add subcommands
+    print "complete -c git-subrepo -n '__fish_use_subcommand' -a '", join(" ", @$list), "'\n";
+
+    # Add options
+    for my $opt (@$options) {
+        my $keys = $opt->{keys};
+        my $desc = $opt->{desc};
+        $desc =~ s/'/'"'"'/g;
+
+        my @short_keys = grep { length $_ == 1 } @$keys;
+        my @long_keys = grep { length $_ > 1 } @$keys;
+        my $arg = $opt->{arg} ? " -r" : "";
+
+        if (@short_keys && @long_keys) {
+            # Has both short and long options
+            for my $i (0..$#long_keys) {
+                my $short = $short_keys[$i] // '';
+                my $long = $long_keys[$i];
+                if ($short) {
+                    print "complete -c git-subrepo -l $long -s $short -d '$desc'$arg\n";
+                } else {
+                    print "complete -c git-subrepo -l $long -d '$desc'$arg\n";
+                }
+            }
+        } else {
+            # Only short or only long options
+            for my $key (@$keys) {
+                if (length $key == 1) {
+                    print "complete -c git-subrepo -s $key -d '$desc'$arg\n";
+                } else {
+                    print "complete -c git-subrepo -l $key -d '$desc'$arg\n";
+                }
+            }
+        }
+    }
+
+    # Add subdir commands completion
+    for my $cmd (@$subdir_cmds) {
+        print <<"...";
+complete -c git-subrepo -n '__fish_git_using_command $cmd' -a '(__fish_git_subrepo_subdirs)'
+...
+    }
+
+    # Special handling for clone command which add folders and git remotes
+    print <<'...';
+complete -c git-subrepo -F -n '__fish_git_using_command clone' -a '(__fish_git_remotes)' -d 'Repository to clone from'
+...
+}
+
 sub generate_bash {
 
     my ($list, $subdir_cmds, $options, $complete_fetch_limit) = @_;
@@ -161,18 +223,18 @@ sub generate_bash {
     }
 
     print <<"...";
-#!bash
-
 # DO NOT EDIT. This file generated by pkg/bin/generate-completion.pl.
 
 _git_subrepo() {
     local _opts="$options_string"
     local subcommands="@$list"
     local subdircommands="@$subdir_cmds"
-    local subcommand="\$(__git_find_on_cmdline "\$subcommands")"
+    local subcommand
+    subcommand="\$(__git_find_on_cmdline "\$subcommands")"
 
     if [ -z "\$subcommand" ]; then
         # no subcommand yet
+        # shellcheck disable=SC2154
         case "\$cur" in
         -*)
             __gitcomp "\$_opts"
@@ -195,9 +257,11 @@ sub generate_bash {
             return
         fi
 
-        local subdircommand="\$(__git_find_on_cmdline "\$subdircommands")"
-        if [ ! -z "\$subdircommand" ]; then
-            local git_subrepos=`git subrepo status -q`
+        local subdircommand
+        subdircommand="\$(__git_find_on_cmdline "\$subdircommands")"
+        if [ -n "\$subdircommand" ]; then
+            local git_subrepos
+            git_subrepos=$(git subrepo status -q)
             __gitcomp "\$git_subrepos"
         fi
 
diff --git a/pkg/bin/generate-help-functions.pl b/pkg/bin/generate-help-functions.pl
old mode 100644
new mode 100755
index 40b6af8f..50ff6a34
--- a/pkg/bin/generate-help-functions.pl
+++ b/pkg/bin/generate-help-functions.pl
@@ -29,8 +29,6 @@ sub main {
 
 sub write_start {
     print <<'...';
-#!/usr/bin/env bash
-
 # DO NOT EDIT. This file generated by pkg/bin/generate-help-functions.pl.
 
 set -e
@@ -86,4 +84,3 @@ sub write_finish {
 Bad usage: '`help`
   Show this manpage.
 ' '' '  Show this manpage.' at tool/gerate-help-functions.pl line 15, <> line 1.
-
diff --git a/share/completion.bash b/share/completion.bash
index adaa9c6d..bff22774 100644
--- a/share/completion.bash
+++ b/share/completion.bash
@@ -1,15 +1,15 @@
-#!bash
-
 # DO NOT EDIT. This file generated by pkg/bin/generate-completion.pl.
 
 _git_subrepo() {
-    local _opts=" -h --help --version -a --all -A --ALL -b= --branch= -e --edit -f --force -F --fetch -M= --method= --Default -m= --message= -r= --remote= -s --squash -u --update -q --quiet -v --verbose -d --debug -x --DEBUG"
+    local _opts=" -h --help --version -a --all -A --ALL -b= --branch= -e --edit -f --force -F --fetch -M= --method= -m= --message= --file= -r= --remote= -s --squash -u --update -q --quiet -v --verbose -d --debug -x --DEBUG"
     local subcommands="branch clean clone commit config fetch help init pull push status upgrade version"
     local subdircommands="branch clean commit config fetch pull push status"
-    local subcommand="$(__git_find_on_cmdline "$subcommands")"
+    local subcommand
+    subcommand="$(__git_find_on_cmdline "$subcommands")"
 
     if [ -z "$subcommand" ]; then
         # no subcommand yet
+        # shellcheck disable=SC2154
         case "$cur" in
         -*)
             __gitcomp "$_opts"
@@ -32,9 +32,11 @@ _git_subrepo() {
             return
         fi
 
-        local subdircommand="$(__git_find_on_cmdline "$subdircommands")"
-        if [ ! -z "$subdircommand" ]; then
-            local git_subrepos=`git subrepo status -q`
+        local subdircommand
+        subdircommand="$(__git_find_on_cmdline "$subdircommands")"
+        if [ -n "$subdircommand" ]; then
+            local git_subrepos
+            git_subrepos=$(git subrepo status -q)
             __gitcomp "$git_subrepos"
         fi
 
diff --git a/share/enable-completion.sh b/share/enable-completion.sh
index 37a2cc21..8681dd16 100644
--- a/share/enable-completion.sh
+++ b/share/enable-completion.sh
@@ -1,4 +1,4 @@
-#!bash
+# shellcheck shell=bash
 
 # Enable git-subrepo completion facilities
 if [[ -n ${BASH_VERSION-} ]]; then
@@ -17,9 +17,10 @@ if [[ -n ${BASH_VERSION-} ]]; then
         {,/usr/local,~/.homebrew}/etc/bash_completion.d/git
       do
         # If a file is found at the location being checked…
+        # shellcheck source=/dev/null
         if [[ -f $f ]]; then
           # …source it.
-          source $f
+          source "$f"
           [[ $(type -t __gitcomp) != function ]] &&
             echo "WARNING: Git completion script '$f' does not provide a '__gitcomp' function"
           # Proceed to loading our Bash completion facilities.
@@ -35,10 +36,14 @@ if [[ -n ${BASH_VERSION-} ]]; then
       # If no file was found at any of the potential file-paths checked
       # above, source a bundled copy of
       # <https://github.com/git/git/blob/c285171/contrib/completion/git-completion.bash>.
+
+      # shellcheck source=share/git-completion.bash
       source "$GIT_SUBREPO_ROOT/share/git-completion.bash"
     }
   fi
   # Load our Bash completion facilities.
+
+  # shellcheck source=share/completion.bash
   source "$GIT_SUBREPO_ROOT/share/completion.bash"
 elif [[ -n ${ZSH_VERSION-} ]]; then
   # Zsh
@@ -46,5 +51,5 @@ elif [[ -n ${ZSH_VERSION-} ]]; then
   # Prepend to `fpath` the path of the directory containing our zsh
   # completion script, so that our completion script will be hooked into the
   # zsh completion system.
-  fpath=($GIT_SUBREPO_ROOT/share/zsh-completion $fpath)
+  fpath=("$GIT_SUBREPO_ROOT/share/zsh-completion" "${fpath[@]}")
 fi
diff --git a/share/git-subrepo.fish b/share/git-subrepo.fish
new file mode 100644
index 00000000..9e403f90
--- /dev/null
+++ b/share/git-subrepo.fish
@@ -0,0 +1,36 @@
+# DO NOT EDIT. This file generated by pkg/bin/generate-completion.pl.
+
+function __fish_git_subrepo_subdirs
+    git subrepo status -q
+end
+
+complete -c git-subrepo -f
+complete -c git-subrepo -n '__fish_use_subcommand' -a 'branch clean clone commit config fetch help init pull push status upgrade version'
+complete -c git-subrepo -s h -d 'Show the command summary'
+complete -c git-subrepo -l help -d 'Help overview'
+complete -c git-subrepo -l version -d 'Print the git-subrepo version number'
+complete -c git-subrepo -l all -s a -d 'Perform command on all current subrepos'
+complete -c git-subrepo -l ALL -s A -d 'Perform command on all subrepos and subsubrepos'
+complete -c git-subrepo -l branch -s b -d 'Specify the upstream branch to push/pull/fetch' -r
+complete -c git-subrepo -l edit -s e -d 'Edit commit message'
+complete -c git-subrepo -l force -s f -d 'Force certain operations'
+complete -c git-subrepo -l fetch -s F -d 'Fetch the upstream content first'
+complete -c git-subrepo -l method -s M -d 'Join method: '"'"'merge'"'"' (default) or '"'"'rebase'"'"'' -r
+complete -c git-subrepo -l message -s m -d 'Specify a commit message' -r
+complete -c git-subrepo -l file -d 'Specify a commit message file' -r
+complete -c git-subrepo -l remote -s r -d 'Specify the upstream remote to push/pull/fetch' -r
+complete -c git-subrepo -l squash -s s -d 'Squash commits on push'
+complete -c git-subrepo -l update -s u -d 'Add the --branch and/or --remote overrides to .gitrepo'
+complete -c git-subrepo -l quiet -s q -d 'Show minimal output'
+complete -c git-subrepo -l verbose -s v -d 'Show verbose output'
+complete -c git-subrepo -l debug -s d -d 'Show the actual commands used'
+complete -c git-subrepo -l DEBUG -s x -d 'Turn on -x Bash debugging'
+complete -c git-subrepo -n '__fish_git_using_command branch' -a '(__fish_git_subrepo_subdirs)'
+complete -c git-subrepo -n '__fish_git_using_command clean' -a '(__fish_git_subrepo_subdirs)'
+complete -c git-subrepo -n '__fish_git_using_command commit' -a '(__fish_git_subrepo_subdirs)'
+complete -c git-subrepo -n '__fish_git_using_command config' -a '(__fish_git_subrepo_subdirs)'
+complete -c git-subrepo -n '__fish_git_using_command fetch' -a '(__fish_git_subrepo_subdirs)'
+complete -c git-subrepo -n '__fish_git_using_command pull' -a '(__fish_git_subrepo_subdirs)'
+complete -c git-subrepo -n '__fish_git_using_command push' -a '(__fish_git_subrepo_subdirs)'
+complete -c git-subrepo -n '__fish_git_using_command status' -a '(__fish_git_subrepo_subdirs)'
+complete -c git-subrepo -F -n '__fish_git_using_command clone' -a '(__fish_git_remotes)' -d 'Repository to clone from'
diff --git a/share/zsh-completion/_git-subrepo b/share/zsh-completion/_git-subrepo
index fc82be20..7f913d69 100644
--- a/share/zsh-completion/_git-subrepo
+++ b/share/zsh-completion/_git-subrepo
@@ -3,11 +3,6 @@
 
 # DO NOT EDIT. This file generated by pkg/bin/generate-completion.pl.
 
-if [[ -z $GIT_SUBREPO_ROOT ]]; then
-	echo 'GIT_SUBREPO_ROOT is null; has `/path/to/git-subrepo/.rc` been sourced?'
-	return 3
-fi
-
 _git-subrepo() {
     typeset -A opt_args
     local curcontext="$curcontext" state line context
@@ -24,9 +19,9 @@ _git-subrepo() {
         '(-e --edit)'{-e,--edit}'[Edit commit message]' \
         '(-f --force)'{-f,--force}'[Force certain operations]' \
         '(-F --fetch)'{-F,--fetch}'[Fetch the upstream content first]' \
-        '(-M --method)'{-M,--method}'[Method when you join, valid options are '"'"'merge'"'"' or '"'"'rebase'"'"']:M' \
-        '--Default[is '"'"'merge'"'"']' \
+        '(-M --method)'{-M,--method}'[Join method: '"'"'merge'"'"' (default) or '"'"'rebase'"'"']:M' \
         '(-m --message)'{-m,--message}'[Specify a commit message]:m' \
+        '--file[Specify a commit message file]:file' \
         '(-r --remote)'{-r,--remote}'[Specify the upstream remote to push/pull/fetch]:r' \
         '(-s --squash)'{-s,--squash}'[Squash commits on push]' \
         '(-u --update)'{-u,--update}'[Add the --branch and/or --remote overrides to .gitrepo]' \
diff --git a/test/Dockerfile b/test/Dockerfile
new file mode 100644
index 00000000..6a0a00c2
--- /dev/null
+++ b/test/Dockerfile
@@ -0,0 +1,225 @@
+FROM ubuntu:20.04
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update
+
+RUN apt-get install -y \
+    bison \
+    build-essential \
+    git \
+    git-lfs \
+    golang-go \
+    vim \
+    wget \
+    autoconf \
+    libssl-dev \
+    libghc-zlib-dev \
+    libcurl4-gnutls-dev \
+    libexpat1-dev \
+    gettext \
+    libpcre3-dev \
+    unzip \
+    libz-dev \
+    make \
+    && true
+
+# Install shellcheck-0.7.1
+RUN cd /root \
+    && wget https://github.com/koalaman/shellcheck/releases/download/v0.7.1/shellcheck-v0.7.1.linux.x86_64.tar.xz \
+    && tar xf shellcheck-v0.7.1.linux.x86_64.tar.xz \
+    && mv shellcheck-v0.7.1/shellcheck /usr/local/bin/ \
+    && rm -fr shellcheck* \
+    && true
+
+# Buil/install bash-4.0
+RUN cd /root \
+    && wget https://ftp.gnu.org/gnu/bash/bash-4.0.tar.gz \
+    && tar -xzf bash-4.0.tar.gz \
+    && cd bash-4.0 \
+    && ./configure --prefix=/bash-4.0 \
+    && make \
+    && make install \
+    && rm -fr bash* \
+    && true
+
+# Buil/install bash-4.1
+RUN cd /root \
+    && wget https://ftp.gnu.org/gnu/bash/bash-4.1.tar.gz \
+    && tar -xzf bash-4.1.tar.gz \
+    && cd bash-4.1 \
+    && ./configure --prefix=/bash-4.1 \
+    && make \
+    && make install \
+    && rm -fr bash* \
+    && true
+
+# Buil/install bash-4.2
+RUN cd /root \
+    && wget https://ftp.gnu.org/gnu/bash/bash-4.2.tar.gz \
+    && tar -xzf bash-4.2.tar.gz \
+    && cd bash-4.2 \
+    && ./configure --prefix=/bash-4.2 \
+    && make \
+    && make install \
+    && rm -fr bash* \
+    && true
+
+# Buil/install bash-4.3
+RUN cd /root \
+    && wget https://ftp.gnu.org/gnu/bash/bash-4.3.tar.gz \
+    && tar -xzf bash-4.3.tar.gz \
+    && cd bash-4.3 \
+    && ./configure --prefix=/bash-4.3 \
+    && make \
+    && make install \
+    && rm -fr bash* \
+    && true
+
+# Buil/install bash-4.4
+RUN cd /root \
+    && wget https://ftp.gnu.org/gnu/bash/bash-4.4.tar.gz \
+    && tar -xzf bash-4.4.tar.gz \
+    && cd bash-4.4 \
+    && ./configure --prefix=/bash-4.4 \
+    && make \
+    && make install \
+    && rm -fr bash* \
+    && true
+
+# Buil/install bash-5.0
+RUN cd /root \
+    && wget https://ftp.gnu.org/gnu/bash/bash-5.0.tar.gz \
+    && tar -xzf bash-5.0.tar.gz \
+    && cd bash-5.0 \
+    && ./configure --prefix=/bash-5.0 \
+    && make \
+    && make install \
+    && rm -fr bash* \
+    && true
+
+# Buil/install bash-5.1-rc1
+RUN cd /root \
+    && wget https://ftp.gnu.org/gnu/bash/bash-5.1-rc1.tar.gz \
+    && tar -xzf bash-5.1-rc1.tar.gz \
+    && cd bash-5.1-rc1 \
+    && ./configure --prefix=/bash-5.1 \
+    && make \
+    && make install \
+    && rm -fr bash* \
+    && true
+
+# Buil/install bash-5.2
+RUN cd /root \
+    && wget https://ftp.gnu.org/gnu/bash/bash-5.2.tar.gz \
+    && tar -xzf bash-5.2.tar.gz \
+    && cd bash-5.2 \
+    && ./configure --prefix=/bash-5.2 \
+    && make \
+    && make install \
+    && rm -fr bash* \
+    && true
+
+# Buil/install bash-5.3
+RUN cd /root \
+    && wget https://ftp.gnu.org/gnu/bash/bash-5.3.tar.gz \
+    && tar -xzf bash-5.3.tar.gz \
+    && cd bash-5.3 \
+    && ./configure --prefix=/bash-5.3 \
+    && make \
+    && make install \
+    && rm -fr bash* \
+    && true
+
+
+# Build/install git-2.17
+RUN cd /root \
+    && wget --timeout=60 --retry-connrefused --tries=3 https://github.com/git/git/archive/v2.23.4.tar.gz \
+    && tar -xzf v2.23.4.tar.gz \
+    && cd git-2.23.4 \
+    && make configure \
+    && ./configure --prefix=/git-2.23 --with-openssl --with-libpcre --with-curl \
+    && make all -j$(nproc) \
+    && make install \
+    && cd /root && rm -fr git* v2.23.4.tar.gz
+
+# Build/install git-2.25
+RUN cd /root \
+    && wget --timeout=60 --retry-connrefused --tries=3 https://github.com/git/git/archive/v2.25.5.tar.gz \
+    && tar -xzf v2.25.5.tar.gz \
+    && cd git-2.25.5 \
+    && make configure \
+    && ./configure --prefix=/git-2.25 --with-openssl --with-libpcre --with-curl \
+    && make all -j$(nproc) \
+    && make install \
+    && cd /root && rm -fr git* v2.25.5.tar.gz
+
+# Build/install git-2.29
+RUN cd /root \
+    && wget --timeout=60 --retry-connrefused --tries=3 https://github.com/git/git/archive/v2.29.3.tar.gz \
+    && tar -xzf v2.29.3.tar.gz \
+    && cd git-2.29.3 \
+    && make configure \
+    && ./configure --prefix=/git-2.29 --with-openssl --with-libpcre --with-curl \
+    && make all -j$(nproc) \
+    && make install \
+    && cd /root && rm -fr git* v2.29.3.tar.gz
+
+# Build/install git-2.30
+RUN cd /root \
+    && wget --timeout=60 --retry-connrefused --tries=3 https://github.com/git/git/archive/v2.30.9.tar.gz \
+    && tar -xzf v2.30.9.tar.gz \
+    && cd git-2.30.9 \
+    && make configure \
+    && ./configure --prefix=/git-2.30 --with-openssl --with-libpcre --with-curl \
+    && make all -j$(nproc) \
+    && make install \
+    && cd /root && rm -fr git* v2.30.9.tar.gz
+
+# Build/install git-2.40
+RUN cd /root \
+    && wget --timeout=60 --retry-connrefused --tries=3 https://github.com/git/git/archive/v2.40.1.tar.gz \
+    && tar -xzf v2.40.1.tar.gz \
+    && cd git-2.40.1 \
+    && make configure \
+    && ./configure --prefix=/git-2.40 --with-openssl --with-libpcre --with-curl \
+    && make all -j$(nproc) \
+    && make install \
+    && cd /root && rm -fr git* v2.40.1.tar.gz
+
+# Build/install git-2.48
+RUN cd /root \
+    && wget --timeout=60 --retry-connrefused --tries=3 https://github.com/git/git/archive/v2.48.0.tar.gz \
+    && tar -xzf v2.48.0.tar.gz \
+    && cd git-2.48.0 \
+    && make configure \
+    && ./configure --prefix=/git-2.48 --with-openssl --with-libpcre --with-curl \
+    && make all -j$(nproc) \
+    && make install \
+    && cd /root && rm -fr git* v2.48.0.tar.gz
+
+# Build/install git-2.51
+RUN cd /root \
+    && wget --timeout=60 --retry-connrefused --tries=3 https://github.com/git/git/archive/v2.51.0.tar.gz \
+    && tar -xzf v2.51.0.tar.gz \
+    && cd git-2.51.0 \
+    && make configure \
+    && ./configure --prefix=/git-2.51 --with-openssl --with-libpcre --with-curl \
+    && make all -j$(nproc) \
+    && make install \
+    && cd /root && rm -fr git* v2.51.0.tar.gz
+
+# Buil/install bash-5.3
+RUN cd /root \
+    && wget https://ftp.gnu.org/gnu/bash/bash-5.3.tar.gz \
+    && tar -xzf bash-5.3.tar.gz \
+    && cd bash-5.3 \
+    && ./configure --prefix=/bash-5.3 \
+    && make \
+    && make install \
+    && rm -fr bash* \
+    && true
+
+RUN git config --global user.email "you@example.com" \
+    && git config --global user.name "Your Name" \
+    && true
diff --git a/test/branch-all.t b/test/branch-all.t
index 23333b61..747ece0d 100644
--- a/test/branch-all.t
+++ b/test/branch-all.t
@@ -11,26 +11,26 @@ note "Test commands work using --all flag"
 clone-foo-and-bar
 
 (
-  cd $OWNER/foo
-  git subrepo clone --quiet ../../../$UPSTREAM/bar one
-  git subrepo clone --quiet ../../../$UPSTREAM/bar two
+  cd "$OWNER/foo"
+  git subrepo clone --quiet "$UPSTREAM/bar" one
+  git subrepo clone --quiet "$UPSTREAM/bar" two
   add-new-files two/file
 )
 
 ok "$(
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo branch --all &> /dev/null
 )" "branch command works with --all even when a subrepo has no new commits"
 
 ok "$(
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git:branch-exists subrepo/two
 )" "The 'subrepo/two' branch exists"
 
 test-exists "$OWNER/foo/.git/tmp/subrepo/two/"
 
 ok "$(
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git:branch-exists subrepo/one
 )" "The 'subrepo/one' branch exists"
 
diff --git a/test/branch-rev-list-one-path.t b/test/branch-rev-list-one-path.t
index 06c72267..afa49050 100644
--- a/test/branch-rev-list-one-path.t
+++ b/test/branch-rev-list-one-path.t
@@ -11,11 +11,11 @@ clone-foo-and-bar
 subrepo-clone-bar-into-foo
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   branchpoint=$(git rev-parse HEAD)
   add-new-files bar/file1
   add-new-files bar/file2
-  git checkout -b other $branchpoint
+  git checkout -b other "$branchpoint"
   add-new-files bar/file3
   add-new-files bar/file4
   add-new-files bar/file5
@@ -25,18 +25,17 @@ subrepo-clone-bar-into-foo
 test-exists "$OWNER/foo/bar/file1" "$OWNER/foo/bar/file2" "$OWNER/foo/bar/file3" "$OWNER/foo/bar/file4" "$OWNER/foo/bar/file5"
 
 is "$(
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo branch bar
 )" \
   "Created branch 'subrepo/bar' and worktree '.git/tmp/subrepo/bar'." \
   "subrepo branch command output is correct"
 
-is $(
-  cd $OWNER/foo
+got="$(
+  cd "$OWNER/foo"
   git rev-list subrepo/bar | wc -l
-) \
-  6 \
-  "We have only created commits for one of the paths"
+)"
+is "${got// /}" "6" "We have only created commits for one of the paths"
 
 done_testing
 
diff --git a/test/branch-rev-list.t b/test/branch-rev-list.t
index e5e64647..243412cd 100644
--- a/test/branch-rev-list.t
+++ b/test/branch-rev-list.t
@@ -11,14 +11,14 @@ clone-foo-and-bar
 subrepo-clone-bar-into-foo
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   branchpoint=$(git rev-parse HEAD)
   add-new-files bar/file1
   # We push here to force subrepo to handle
   # histories where it's not first parent
   git subrepo push bar
   add-new-files bar/file2
-  git checkout -b other $branchpoint
+  git checkout -b other "$branchpoint"
   add-new-files bar/file3
   add-new-files bar/file4
   add-new-files bar/file5
@@ -29,18 +29,17 @@ test-exists "$OWNER/foo/bar/file1" "$OWNER/foo/bar/file2" "$OWNER/foo/bar/file3"
 
 # -F is needed for branch to fetch new information
 is "$(
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo -F branch bar
 )" \
   "Created branch 'subrepo/bar' and worktree '.git/tmp/subrepo/bar'." \
   "subrepo branch command output is correct"
 
-is $(
-  cd $OWNER/foo
+got="$(
+  cd "$OWNER/foo"
   git rev-list subrepo/bar | wc -l
-) \
-  5 \
-  "We have only created commits for one of the paths"
+)"
+is "${got// /}" "5" "We have only created commits for one of the paths"
 
 done_testing
 
diff --git a/test/branch.t b/test/branch.t
index 40a912e3..fd9d3764 100644
--- a/test/branch.t
+++ b/test/branch.t
@@ -10,39 +10,39 @@ clone-foo-and-bar
 
 subrepo-clone-bar-into-foo
 
-before="$(date -r $OWNER/foo/Foo '+%s')"
+before=$(date -r "$OWNER"/foo/Foo '+%s')
 
 (
-  cd $OWNER/foo
+  cd "$OWNER"/foo
   add-new-files bar/file
   add-new-files .gitrepo
 )
 
-save-original-state $OWNER/foo bar
+save-original-state "$OWNER"/foo bar
 
 # Make sure that time stamps differ
 sleep 1
 
 is "$(
-  cd $OWNER/foo
+  cd "$OWNER"/foo
   git subrepo branch bar
 )" \
   "Created branch 'subrepo/bar' and worktree '.git/tmp/subrepo/bar'." \
   "subrepo branch command output is correct"
 
 
-after="$(date -r $OWNER/foo/Foo '+%s')"
-assert-original-state $OWNER/foo bar
+after=$(date -r "$OWNER"/foo/Foo '+%s')
+assert-original-state "$OWNER"/foo bar
 
 # Check that we haven't checked out any temporary files
 is "$before" "$after" \
   "No modification on Foo"
 
-test-exists "$OWNER/foo/.git/tmp/subrepo/bar/"
+test-exists "$OWNER"/foo/.git/tmp/subrepo/bar/
 
 is "$(
-  cd $OWNER/foo/.git/tmp/subrepo/bar
-  git branch | grep \*
+  cd "$OWNER"/foo/.git/tmp/subrepo/bar
+  git branch | grep '\*'
 )" \
   "* subrepo/bar" \
   "Correct branch is checked out"
diff --git a/test/clean.t b/test/clean.t
index b755bb73..2d289faa 100644
--- a/test/clean.t
+++ b/test/clean.t
@@ -11,7 +11,7 @@ clone-foo-and-bar
 subrepo-clone-bar-into-foo
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   add-new-files bar/file
   git subrepo --quiet branch bar
 )
@@ -21,7 +21,7 @@ test-exists \
   "$OWNER/foo/.git/refs/subrepo/bar/fetch"
 
 is "$(
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo clean bar
 )" \
   "Removed branch 'subrepo/bar'." \
@@ -31,7 +31,7 @@ test-exists \
   "!$OWNER/foo/.git/refs/heads/subrepo/bar"
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo clean --force bar
 )
 
diff --git a/test/clone-annotated-tag.t b/test/clone-annotated-tag.t
index 69b410d6..862b1b68 100644
--- a/test/clone-annotated-tag.t
+++ b/test/clone-annotated-tag.t
@@ -9,17 +9,17 @@ use Test::More
 clone-foo-and-bar
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   git tag -a annotated_tag -m "My annotated tag"
   git tag lightweight_tag
 ) # >& /dev/null || die
 
 # Do the subrepo clone with tag and test the output:
 {
-  clone_output="$(
-    cd $OWNER/foo
+  clone_output=$(
+    cd "$OWNER/foo"
     git subrepo clone ../bar/.git -b lightweight_tag light
-  )"
+  )
 
   # Check output is correct:
   is "$clone_output" \
@@ -29,10 +29,10 @@ clone-foo-and-bar
 
 # Do the subrepo clone with tag and test the output:
 {
-  clone_output="$(
-    cd $OWNER/foo
+  clone_output=$(
+    cd "$OWNER/foo"
     git subrepo clone ../bar/.git -b annotated_tag ann 2>&1 || true
-  )"
+  )
 
   # Check output is correct:
   is "$clone_output" \
diff --git a/test/clone.t b/test/clone.t
index ccfd6ab2..14515381 100644
--- a/test/clone.t
+++ b/test/clone.t
@@ -26,32 +26,27 @@ clone-foo-and-bar
 
 # Do the subrepo clone and test the output:
 {
-  clone_output="$(
-    cd $OWNER/foo
-    git subrepo clone ../../../$UPSTREAM/bar
-  )"
+  clone_output=$(
+    cd "$OWNER/foo"
+    git subrepo clone "$UPSTREAM/bar"
+  )
 
   # Check output is correct:
   is "$clone_output" \
-    "Subrepo '../../../tmp/upstream/bar' (master) cloned into 'bar'." \
+    "Subrepo '$UPSTREAM/bar' (master) cloned into 'bar'." \
     'subrepo clone command output is correct'
 
-  remote_output="$(
-    cd $OWNER/foo
-    git remote -v
-  )"
-
   is "$(
-    cd $OWNER/foo
+    cd "$OWNER/foo"
     git remote -v | grep subrepo/bar
   )" \
     "" \
     'No remotes created'
 
-  clone_output_empty="$(
-    cd $OWNER/empty
-    catch git subrepo clone ../../../$UPSTREAM/bar
-  )"
+  clone_output_empty=$(
+    cd "$OWNER/empty"
+    catch git subrepo clone "$UPSTREAM/bar"
+  )
 
   # Check output is correct:
   is "$clone_output_empty" \
@@ -71,31 +66,31 @@ gitrepo=$OWNER/foo/bar/.gitrepo
 
 # Test foo/bar/.gitrepo file contents:
 {
-  foo_clone_commit="$(cd $OWNER/foo; git rev-parse HEAD^)"
-  bar_head_commit="$(cd $OWNER/bar; git rev-parse HEAD)"
+  foo_clone_commit=$(cd "$OWNER/foo"; git rev-parse HEAD^)
+  bar_head_commit=$(cd "$OWNER/bar"; git rev-parse HEAD)
   test-gitrepo-comment-block
-  test-gitrepo-field "remote" "../../../$UPSTREAM/bar"
+  test-gitrepo-field "remote" "$UPSTREAM/bar"
   test-gitrepo-field "branch" "master"
   test-gitrepo-field "commit" "$bar_head_commit"
   test-gitrepo-field "parent" "$foo_clone_commit"
-  test-gitrepo-field "cmdver" "`git subrepo --version`"
+  test-gitrepo-field "cmdver" "$(git subrepo --version)"
 }
 
 # Make sure status is clean:
 {
-  git_status="$(
-    cd $OWNER/foo
+  git_status=$(
+    cd "$OWNER/foo"
     git status -s
-  )"
+  )
 
   is "$git_status" \
     "" \
     'status is clean'
 
-  git_status_empty="$(
-    cd $OWNER/empty
+  git_status_empty=$(
+    cd "$OWNER/empty"
     git status -s
-  )"
+  )
 
   is "$git_status_empty" \
     "" \
diff --git a/test/config.t b/test/config.t
index 0905127f..ec5160c4 100644
--- a/test/config.t
+++ b/test/config.t
@@ -6,8 +6,9 @@ source test/setup
 
 use Test::More
 
-git clone $UPSTREAM/init $OWNER/init &>/dev/null
+git clone "$UPSTREAM/init" "$OWNER/init" &>/dev/null
 
+# shellcheck disable=2034
 gitrepo=$OWNER/init/doc/.gitrepo
 
 (
@@ -22,11 +23,11 @@ gitrepo=$OWNER/init/doc/.gitrepo
   test-gitrepo-field "commit" ""
   test-gitrepo-field "parent" ""
   test-gitrepo-field "method" "merge"
-  test-gitrepo-field "cmdver" "`git subrepo --version`"
+  test-gitrepo-field "cmdver" "$(git subrepo --version)"
 }
 
 is "$(
-  cd $OWNER/init
+  cd "$OWNER/init"
   git subrepo config doc method rebase
 )" \
   "Subrepo 'doc' option 'method' set to 'rebase'."
@@ -37,17 +38,17 @@ is "$(
   test-gitrepo-field "commit" ""
   test-gitrepo-field "parent" ""
   test-gitrepo-field "method" "rebase"
-  test-gitrepo-field "cmdver" "`git subrepo --version`"
+  test-gitrepo-field "cmdver" "$(git subrepo --version)"
 }
 
 is "$(
-  cd $OWNER/init
+  cd "$OWNER/init"
   git subrepo config doc method
 )" \
   "Subrepo 'doc' option 'method' has value 'rebase'."
 
 is "$(
-  cd $OWNER/init
+  cd "$OWNER/init"
   catch git subrepo config doc branch new
 )" \
   "git-subrepo: This option is autogenerated, use '--force' to override."
diff --git a/test/encode.t b/test/encode.t
index d30c92b9..945a04d2 100644
--- a/test/encode.t
+++ b/test/encode.t
@@ -6,31 +6,30 @@ source test/setup
 
 use Test::More
 
-
 export round=0
 test_round() {
   clone-foo-and-bar
 
   round=$(( round + 1 ))
-  normalize_dir="$1"
-  normalize_dir="${normalize_dir#./}"
-  normalize_dir="${normalize_dir%/}"
+  normalize_dir=$1
+  normalize_dir=${normalize_dir#./}
+  normalize_dir=${normalize_dir%/}
   while [[ $normalize_dir =~ (//+) ]]; do normalize_dir=${normalize_dir//${BASH_REMATCH[1]}/\/}; done
 
-  clone_output="$(
-    cd $OWNER/foo
-    git subrepo clone ../../../$UPSTREAM/bar -- "$normalize_dir"
-  )"
+  clone_output=$(
+    cd "$OWNER/foo"
+    git subrepo clone "$UPSTREAM/bar" -- "$normalize_dir"
+  )
 
   # Check output is correct:
   is "$clone_output" \
-    "Subrepo '../../../tmp/upstream/bar' (master) cloned into '$normalize_dir'." \
+    "Subrepo '$UPSTREAM/bar' (master) cloned into '$normalize_dir'." \
     'subrepo clone command output is correct'
 
   test-exists "$OWNER/foo/$normalize_dir/"
 
   (
-    cd $OWNER/bar
+    cd "$OWNER/bar"
     git pull
     add-new-files Bar2-$round
     git push
@@ -39,10 +38,10 @@ test_round() {
   # Do the pull and check output:
   {
     is "$(
-       cd $OWNER/foo
+       cd "$OWNER/foo"
        git subrepo pull -- "$normalize_dir"
        )" \
-       "Subrepo '$normalize_dir' pulled from '../../../tmp/upstream/bar' (master)." \
+       "Subrepo '$normalize_dir' pulled from '$UPSTREAM/bar' (master)." \
        'subrepo pull command output is correct'
   }
 
@@ -58,10 +57,10 @@ test_round() {
   # Do the push and check output:
   {
     is "$(
-       cd $OWNER/foo
+       cd "$OWNER/foo"
        git subrepo push -- "$normalize_dir"
        )" \
-       "Subrepo '$normalize_dir' pushed to '../../../tmp/upstream/bar' (master)." \
+       "Subrepo '$normalize_dir' pushed to '$UPSTREAM/bar' (master)." \
        'subrepo push command output is correct'
   }
 }
@@ -71,9 +70,9 @@ test_round .dot
 test_round ......dots
 test_round 'spa ce'
 test_round 'per%cent'
-test_round 'back-sl\ash'
+test_round 'back-sl\as/h'
 test_round 'end-with.lock'
-test_round '@'
+# test_round '@'  # TODO Fix. This broke on recent git version...
 test_round '@{'
 test_round '['
 test_round '-begin-with-minus'
@@ -84,7 +83,8 @@ test_round 'many////slashes'
 test_round '_under_scores_'
 
 test_round '.str%a\nge...'
-test_round '~////......s:a^t?r a*n[g@{e.lock'
+test_round ~'////......s:a^t?r a*n[g@{e.lock'
+
 
 done_testing
 
diff --git a/test/error.t b/test/error.t
index 0e3100d3..17ffc37e 100644
--- a/test/error.t
+++ b/test/error.t
@@ -13,8 +13,8 @@ clone-foo-and-bar
 
 {
   is "$(
-      cd $OWNER/bar
-      git subrepo --quiet clone ../../../$UPSTREAM/foo
+      cd "$OWNER/bar"
+      git subrepo --quiet clone "$UPSTREAM/foo"
       add-new-files foo/file
       git subrepo --quiet branch foo
       catch git subrepo branch foo
@@ -23,7 +23,7 @@ clone-foo-and-bar
     "Error OK: can't create a branch that exists"
 
   (
-    cd $OWNER/bar
+    cd "$OWNER/bar"
     git subrepo --quiet clean foo
     git reset --quiet --hard HEAD^
   )
@@ -55,7 +55,7 @@ clone-foo-and-bar
 
 {
   like "$(
-      cd $OWNER/bar
+      cd "$OWNER/bar"
       catch git subrepo pull /home/user/bar/foo
     )" \
     "git-subrepo: The subdir '.*/home/user/bar/foo' should not be absolute path." \
@@ -66,8 +66,8 @@ clone-foo-and-bar
   # XXX add 'commit' to cmds here when implemented:
   for cmd in pull push fetch branch commit clean; do
     is "$(
-        cd $OWNER/bar
-        catch git subrepo $cmd
+        cd "$OWNER/bar"
+        catch git subrepo "$cmd"
       )" \
       "git-subrepo: Command '$cmd' requires arg 'subdir'." \
       "Error OK: check that '$cmd' requires subdir"
@@ -76,7 +76,7 @@ clone-foo-and-bar
 
 {
   is "$(
-      cd $OWNER/bar
+      cd "$OWNER/bar"
       catch git subrepo clone foo bar baz quux
     )" \
     "git-subrepo: Unknown argument(s) 'baz quux' for 'clone' command." \
@@ -85,7 +85,7 @@ clone-foo-and-bar
 
 {
   is "$(
-      cd $OWNER/bar
+      cd "$OWNER/bar"
       catch git subrepo clone .git
     )" \
     "git-subrepo: Can't determine subdir from '.git'." \
@@ -94,7 +94,7 @@ clone-foo-and-bar
 
 {
   is "$(
-      cd $OWNER/bar
+      cd "$OWNER/bar"
       catch git subrepo pull lala
     )" \
     "git-subrepo: No 'lala/.gitrepo' file." \
@@ -103,54 +103,54 @@ clone-foo-and-bar
 
 {
   is "$(
-      cd $OWNER/bar
-      git checkout --quiet $(git rev-parse master)
+      cd "$OWNER/bar"
+      git checkout --quiet "$(git rev-parse master)"
       catch git subrepo status
     )" \
     "git-subrepo: Must be on a branch to run this command." \
     "Error OK: check repo is on a branch"
   (
-    cd $OWNER/bar
+    cd "$OWNER/bar"
     git checkout --quiet master
   )
 }
 
 {
-  is "$(
+  like "$(
       cd .git
       catch git subrepo status
     )" \
-    "git-subrepo: Can't 'subrepo status' outside a working tree." \
+    "git-subrepo: (Can't 'subrepo status' outside a working tree\.|Not inside a git repository\.)" \
     "Error OK: check inside working tree"
 }
 
 {
   like "$(
-      cd $OWNER/bar
+      cd "$OWNER/bar"
       touch me
       git add me
-      catch git subrepo clone ../../../$UPSTREAM/foo
+      catch git subrepo clone "$UPSTREAM/foo"
     )" \
     "git-subrepo: Can't clone subrepo. Working tree has changes." \
     "Error OK: check no working tree changes"
   (
-    cd $OWNER/bar
+    cd "$OWNER/bar"
     git reset --quiet --hard
   )
 }
 
 {
-  is "$(
+  like "$(
       cd lib
       catch git subrepo status
     )" \
-    "git-subrepo: Need to run subrepo command from top level directory of the repo." \
+    "git-subrepo: (Need to run subrepo command from top level directory of the repo\.|Not inside a git repository\.)" \
     "Error OK: check cwd is at top level"
 }
 
 {
   is "$(
-      cd $OWNER/bar
+      cd "$OWNER/bar"
       catch git subrepo clone dummy bard
     )" \
     "git-subrepo: The subdir 'bard' exists and is not empty." \
@@ -159,10 +159,10 @@ clone-foo-and-bar
 
 {
   is "$(
-      cd $OWNER/bar
+      cd "$OWNER/bar"
       catch git subrepo clone dummy-repo
     )" \
-    "git-subrepo: Command failed: 'git ls-remote dummy-repo'." \
+    "git-subrepo: Command failed: 'git ls-remote --symref dummy-repo'." \
     "Error OK: clone non-repo"
 }
 
diff --git a/test/fetch.t b/test/fetch.t
index c5f099fa..a3aa44eb 100644
--- a/test/fetch.t
+++ b/test/fetch.t
@@ -11,7 +11,7 @@ clone-foo-and-bar
 subrepo-clone-bar-into-foo
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   add-new-files Bar2
   git tag -a CoolTag -m "Should stay in subrepo"
   git push
@@ -21,17 +21,17 @@ subrepo-clone-bar-into-foo
 # Fetch information
 {
   is "$(
-    cd $OWNER/foo
+    cd "$OWNER/foo"
     git subrepo fetch bar
   )" \
-    "Fetched 'bar' from '../../../tmp/upstream/bar' (master)." \
+    "Fetched 'bar' from '$UPSTREAM/bar' (master)." \
     'subrepo fetch command output is correct'
 }
 
 # Check that there is no tags fetched
 {
   is "$(
-    cd $OWNER/foo
+    cd "$OWNER/foo"
     git tag -l 'CoolTag'
   )" \
     "" \
diff --git a/test/gitignore.t b/test/gitignore.t
index a1975aaf..908e0da4 100644
--- a/test/gitignore.t
+++ b/test/gitignore.t
@@ -11,13 +11,13 @@ clone-foo-and-bar
 subrepo-clone-bar-into-foo
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   add-new-files Bar2
   git push
 ) &> /dev/null || die
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   echo ".*" >> .gitignore
   git add .gitignore
   git commit -m "Add gitignore"
@@ -29,10 +29,10 @@ subrepo-clone-bar-into-foo
 # Do the pull and check output:
 {
   is "$(
-    cd $OWNER/foo
+    cd "$OWNER/foo"
     git subrepo pull bar
   )" \
-    "Subrepo 'bar' pulled from '../../../tmp/upstream/bar' (master)." \
+    "Subrepo 'bar' pulled from '$UPSTREAM/bar' (master)." \
     'subrepo pull command output is correct'
 }
 
@@ -46,14 +46,14 @@ gitrepo=$OWNER/foo/bar/.gitrepo
 
 # Test foo/bar/.gitrepo file contents:
 {
-  foo_pull_commit="$(cd $OWNER/foo; git rev-parse HEAD^)"
-  bar_head_commit="$(cd $OWNER/bar; git rev-parse HEAD)"
+  foo_pull_commit=$(cd "$OWNER/foo"; git rev-parse HEAD^)
+  bar_head_commit=$(cd "$OWNER/bar"; git rev-parse HEAD)
   test-gitrepo-comment-block
-  test-gitrepo-field "remote" "../../../$UPSTREAM/bar"
+  test-gitrepo-field "remote" "$UPSTREAM/bar"
   test-gitrepo-field "branch" "master"
   test-gitrepo-field "commit" "$bar_head_commit"
   test-gitrepo-field "parent" "$foo_pull_commit"
-  test-gitrepo-field "cmdver" "`git subrepo --version`"
+  test-gitrepo-field "cmdver" "$(git subrepo --version)"
 }
 
 done_testing
diff --git a/test/init.t b/test/init.t
index 0651754b..56453dc4 100644
--- a/test/init.t
+++ b/test/init.t
@@ -6,7 +6,7 @@ source test/setup
 
 use Test::More
 
-git clone $UPSTREAM/init $OWNER/init &>/dev/null
+git clone "$UPSTREAM/init" "$OWNER/init" &>/dev/null
 
 gitrepo=$OWNER/init/doc/.gitrepo
 
@@ -20,10 +20,10 @@ gitrepo=$OWNER/init/doc/.gitrepo
     "!$gitrepo"
 }
 
-output="$(
+output=$(
   cd "$OWNER/init"
   git subrepo init doc
-)"
+)
 
 is "$output" "Subrepo created from 'doc' (with no remote)." \
   'Command output is correct'
@@ -35,18 +35,17 @@ is "$output" "Subrepo created from 'doc' (with no remote)." \
 
 # Test init/doc/.gitrepo file contents:
 {
-  init_clone_commit="$(cd $OWNER/init; git rev-parse HEAD^)"
   test-gitrepo-comment-block
   test-gitrepo-field "remote" "none"
   test-gitrepo-field "branch" "master"
   test-gitrepo-field "commit" ""
   test-gitrepo-field "parent" ""
   test-gitrepo-field "method" "merge"
-  test-gitrepo-field "cmdver" "`git subrepo --version`"
+  test-gitrepo-field "cmdver" "$(git subrepo --version)"
 }
 
 rm -fr "$OWNER/init"
-git clone $UPSTREAM/init $OWNER/init &>/dev/null
+git clone "$UPSTREAM/init" "$OWNER/init" &>/dev/null
 (
   cd "$OWNER/init"
   git subrepo init doc -r git@github.com:user/repo -b foo -M rebase
@@ -57,7 +56,7 @@ test-gitrepo-field "branch" "foo"
 test-gitrepo-field "commit" ""
 test-gitrepo-field "parent" ""
 test-gitrepo-field "method" "rebase"
-test-gitrepo-field "cmdver" "`git subrepo --version`"
+test-gitrepo-field "cmdver" "$(git subrepo --version)"
 
 done_testing
 
diff --git a/test/issue29.t b/test/issue29.t
index 53d8689e..57df236e 100644
--- a/test/issue29.t
+++ b/test/issue29.t
@@ -40,7 +40,7 @@ cd "$TMP"
   touch main1
   git add main1
   git commit -m "Initial main1"
-  git subrepo clone ../share share -b master
+  git subrepo clone ../share share -b "$DEFAULTBRANCH"
 ) > /dev/null
 
 # `subrepo clone` the share repo into main2:
@@ -49,7 +49,7 @@ cd "$TMP"
   touch main2
   git add main2
   git commit -m "Initial main2"
-  git subrepo clone ../share share -b master
+  git subrepo clone ../share share -b "$DEFAULTBRANCH"
 ) > /dev/null
 
 
@@ -64,7 +64,7 @@ msg_main1="main1 initial add to subrepo"
   git subrepo push share
 ) &> /dev/null
 
-ok "`! git:branch-exists "subrepo-push/share"`" \
+ok "$(! git:branch-exists "subrepo-push/share")" \
   "The subrepo-push/share branch was deleted after push"
 
 # TODO Check the state of refs made
diff --git a/test/issue95.t b/test/issue95.t
index 3c929f3b..b268fbe8 100644
--- a/test/issue95.t
+++ b/test/issue95.t
@@ -46,7 +46,7 @@ use Test::More
         touch feature
         git add feature
         git commit -m "feature added"
-        git checkout master
+        git checkout "$DEFAULTBRANCH"
     ) &> /dev/null
 
     # Commit directly to subrepo
@@ -89,7 +89,7 @@ use Test::More
             cd host
             git subrepo pull sub
     )" \
-        "Subrepo 'sub' pulled from '../sub' (master)."
+        "Subrepo 'sub' pulled from '../sub' ($DEFAULTBRANCH)."
 
 }
 
diff --git a/test/issue96.t b/test/issue96.t
index 84025440..1b16567c 100644
--- a/test/issue96.t
+++ b/test/issue96.t
@@ -81,15 +81,15 @@ use Test::More
             cd host
             git subrepo pull sub
     )" \
-        "Subrepo 'sub' pulled from '../sub' (master)."
+        "Subrepo 'sub' pulled from '../sub' ($DEFAULTBRANCH)."
 
     # Push subrepo changes
     # expected: successful push without conflicts
     is "$(
             cd host
-            git subrepo push sub -b master -u
+            git subrepo push sub -b "$DEFAULTBRANCH" -u
     )" \
-       "Subrepo 'sub' pushed to '../sub' (master)."
+       "Subrepo 'sub' pushed to '../sub' ($DEFAULTBRANCH)."
 
 done_testing 2
 
diff --git a/test/pull-all.t b/test/pull-all.t
index ee5a1c47..2eb626ff 100644
--- a/test/pull-all.t
+++ b/test/pull-all.t
@@ -9,26 +9,26 @@ use Test::More
 clone-foo-and-bar
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo clone ../bar bar1
   git subrepo clone ../bar bar2
 ) &> /dev/null || die
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   modify-files Bar
 ) &> /dev/null || die
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo pull --all
 ) &> /dev/null || die
 
 {
-  is "$(cat $OWNER/foo/bar1/Bar)" \
+  is "$(cat "$OWNER/foo/bar1/Bar")" \
     "a new line" \
     'bar1/Bar content correct'
-  is "$(cat $OWNER/foo/bar2/Bar)" \
+  is "$(cat "$OWNER/foo/bar2/Bar")" \
     "a new line" \
     'bar2/Bar content correct'
 }
diff --git a/test/pull-merge.t b/test/pull-merge.t
index 285a798b..e0d9e764 100644
--- a/test/pull-merge.t
+++ b/test/pull-merge.t
@@ -13,37 +13,38 @@ subrepo-clone-bar-into-foo
 note "Pull - Conflict - Merge ours/theirs - Push"
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   add-new-files Bar2
   git push
 ) &> /dev/null || die
 
+# shellcheck disable=2034
 gitrepo=$OWNER/foo/bar/.gitrepo
 # Test foo/bar/.gitrepo file contents:
 {
-  foo_pull_commit="$(cd $OWNER/foo; git rev-parse HEAD^)"
-  bar_head_commit="$(cd $OWNER/bar; git rev-parse HEAD^)"
+  foo_pull_commit=$(cd "$OWNER/foo"; git rev-parse HEAD^)
+  bar_head_commit=$(cd "$OWNER/bar"; git rev-parse HEAD^)
   test-gitrepo-field "commit" "$bar_head_commit"
   test-gitrepo-field "parent" "$foo_pull_commit"
 }
 
-foo_pull_commit="$(cd $OWNER/foo; git rev-parse HEAD)"
+foo_pull_commit=$(cd "$OWNER/foo"; git rev-parse HEAD)
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo pull bar
   modify-files-ex bar/Bar2
   git push
 ) &> /dev/null || die
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   modify-files-ex Bar2
   git push
 ) &> /dev/null || die
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo pull bar || {
       cd .git/tmp/subrepo/bar
       echo "Merged Bar2" > Bar2
@@ -59,13 +60,13 @@ test-exists \
   "$OWNER/foo/bar/Bar2" \
   "$OWNER/bar/Bar2" \
 
-is "$(cat $OWNER/foo/bar/Bar2)" \
+is "$(cat "$OWNER/foo/bar/Bar2")" \
   "Merged Bar2" \
   "The readme file in the mainrepo is merged"
 
 # Check commit messages
 {
-  foo_new_commit_message="$(cd $OWNER/foo; git log --format=%B -n 1)"
+  foo_new_commit_message=$(cd "$OWNER/foo"; git log --format=%B -n 1)
   like "$foo_new_commit_message" \
       "git subrepo commit \(merge\) bar" \
       "subrepo pull should have merge message"
@@ -73,26 +74,26 @@ is "$(cat $OWNER/foo/bar/Bar2)" \
 
 # Test foo/bar/.gitrepo file contents:
 {
-  bar_head_commit="$(cd $OWNER/bar; git rev-parse HEAD)"
+  bar_head_commit=$(cd "$OWNER/bar"; git rev-parse HEAD)
   test-gitrepo-field "commit" "$bar_head_commit"
   test-gitrepo-field "parent" "$foo_pull_commit"
 }
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo push bar
 ) &> /dev/null || die
 
 # Check commit messages
 {
-  foo_new_commit_message="$(cd $OWNER/foo; git log --format=%B -n 1)"
+  foo_new_commit_message=$(cd "$OWNER/foo"; git log --format=%B -n 1)
   like "$foo_new_commit_message" \
       "git subrepo push bar" \
       "subrepo push should not have merge message"
 }
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   git pull
 ) &> /dev/null || die
 
@@ -100,11 +101,11 @@ test-exists \
   "$OWNER/foo/bar/Bar2" \
   "$OWNER/bar/Bar2" \
 
-is "$(cat $OWNER/foo/bar/Bar2)" \
+is "$(cat "$OWNER/foo/bar/Bar2")" \
   "Merged Bar2" \
   "The readme file in the mainrepo is merged"
 
-is "$(cat $OWNER/bar/Bar2)" \
+is "$(cat "$OWNER/bar/Bar2")" \
   "Merged Bar2" \
   "The readme file in the subrepo is merged"
 
diff --git a/test/pull-message.t b/test/pull-message.t
index 3d998e60..d172e8b0 100644
--- a/test/pull-message.t
+++ b/test/pull-message.t
@@ -11,7 +11,7 @@ clone-foo-and-bar
 subrepo-clone-bar-into-foo
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   add-new-files Bar2
   git push
 ) &> /dev/null || die
@@ -20,23 +20,23 @@ subrepo-clone-bar-into-foo
 # Do the pull and check output, use -m:
 {
   is "$(
-    cd $OWNER/foo
+    cd "$OWNER/foo"
     git subrepo pull -m 'Hello World' bar
   )" \
-    "Subrepo 'bar' pulled from '../../../tmp/upstream/bar' (master)." \
+    "Subrepo 'bar' pulled from '$UPSTREAM/bar' (master)." \
     'subrepo pull command output is correct'
 }
 
 # Check -m commit messages
 {
-  foo_new_commit_message="$(cd $OWNER/foo; git log --format=%B -n 1)"
+  foo_new_commit_message=$(cd "$OWNER/foo"; git log --format=%B -n 1)
   like "$foo_new_commit_message" \
       "Hello World" \
       "subrepo pull commit message"
 }
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   add-new-files Bar3
   git push
 ) &> /dev/null || die
@@ -44,23 +44,23 @@ subrepo-clone-bar-into-foo
 # Do the pull and check output, use -e:
 {
   is "$(
-    cd $OWNER/foo
+    cd "$OWNER/foo"
     GIT_EDITOR='echo cowabunga >' git subrepo pull -e bar
   )" \
-    "Subrepo 'bar' pulled from '../../../tmp/upstream/bar' (master)." \
+    "Subrepo 'bar' pulled from '$UPSTREAM/bar' (master)." \
     'subrepo pull command output is correct'
 }
 
 # Check -e commit messages
 {
-  foo_new_commit_message="$(cd $OWNER/foo; git log --format=%B -n 1)"
+  foo_new_commit_message="$(cd "$OWNER/foo"; git log --format=%B -n 1)"
   like "$foo_new_commit_message" \
       "cowabunga" \
       "subrepo pull edit commit message"
 }
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   add-new-files Bar4
   git push
 ) &> /dev/null || die
@@ -68,16 +68,16 @@ subrepo-clone-bar-into-foo
 # Do the pull and check output, use -e and -m:
 {
   is "$(
-    cd $OWNER/foo
+    cd "$OWNER/foo"
     GIT_EDITOR=true git subrepo pull -e -m original bar
   )" \
-    "Subrepo 'bar' pulled from '../../../tmp/upstream/bar' (master)." \
+    "Subrepo 'bar' pulled from '$UPSTREAM/bar' (master)." \
     'subrepo pull command output is correct'
 }
 
 # Check -e commit messages
 {
-  foo_new_commit_message="$(cd $OWNER/foo; git log --format=%B -n 1)"
+  foo_new_commit_message="$(cd "$OWNER/foo"; git log --format=%B -n 1)"
   like "$foo_new_commit_message" \
       "original" \
       "subrepo pull edit and message commit message"
diff --git a/test/pull-new-branch.t b/test/pull-new-branch.t
index d3a8703e..0910760f 100644
--- a/test/pull-new-branch.t
+++ b/test/pull-new-branch.t
@@ -15,13 +15,14 @@ subrepo-clone-bar-into-foo
 ) &> /dev/null || die
 
 # Test subrepo file content:
+# shellcheck disable=2034
 gitrepo=$OWNER/foo/bar/.gitrepo
 
 {
-  foo_pull_commit=$(cd "$OWNER/foo"; git rev-parse HEAD^)
-  bar_head_commit=$(cd "$OWNER/bar"; git rev-parse HEAD)
+  foo_pull_commit=$(cd "$OWNER/foo" || exit; git rev-parse HEAD^)
+  bar_head_commit=$(cd "$OWNER/bar" || exit; git rev-parse HEAD)
   test-gitrepo-comment-block
-  test-gitrepo-field remote "../../../$UPSTREAM/bar"
+  test-gitrepo-field remote "$UPSTREAM/bar"
   test-gitrepo-field branch master
   test-gitrepo-field commit "$bar_head_commit"
   test-gitrepo-field parent "$foo_pull_commit"
@@ -34,10 +35,10 @@ gitrepo=$OWNER/foo/bar/.gitrepo
 ) &> /dev/null || die
 
 {
-  foo_pull_commit=$(cd "$OWNER/foo"; git rev-parse HEAD^)
-  bar_head_commit=$(cd "$OWNER/bar"; git rev-parse HEAD)
+  foo_pull_commit=$(cd "$OWNER/foo" || exit; git rev-parse HEAD^)
+  bar_head_commit=$(cd "$OWNER/bar" || exit; git rev-parse HEAD)
   test-gitrepo-comment-block
-  test-gitrepo-field remote "../../../$UPSTREAM/bar"
+  test-gitrepo-field remote "$UPSTREAM/bar"
   test-gitrepo-field branch branch1
   test-gitrepo-field commit "$bar_head_commit"
   test-gitrepo-field parent "$foo_pull_commit"
@@ -46,7 +47,7 @@ gitrepo=$OWNER/foo/bar/.gitrepo
 
 {
   is "$(
-    cd $OWNER/foo
+    cd "$OWNER/foo" || exit
     git subrepo pull bar
   )" \
     "Subrepo 'bar' is up to date." \
diff --git a/test/pull-ours.t b/test/pull-ours.t
index 33401df3..9d6c5222 100644
--- a/test/pull-ours.t
+++ b/test/pull-ours.t
@@ -19,13 +19,13 @@ note "Pull - Conflict - Use ours - Push"
 #
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   add-new-files Bar2
   git push
 ) &> /dev/null || die
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo pull bar
   modify-files-ex bar/Bar2
   cat bar/Bar2
@@ -33,15 +33,15 @@ note "Pull - Conflict - Use ours - Push"
 ) &> /dev/null || die
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   modify-files-ex Bar2
   git push
 ) &> /dev/null || die
 
-before="$(date -r $OWNER/foo/Foo '+%s')"
+before=$(date -r "$OWNER/foo/Foo" '+%s')
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo pull bar || {
       cd .git/tmp/subrepo/bar
       git checkout --ours Bar2
@@ -54,7 +54,7 @@ before="$(date -r $OWNER/foo/Foo '+%s')"
 ) &> /dev/null || die
 
 sleep 1
-after="$(date -r $OWNER/foo/Foo '+%s')"
+after=$(date -r "$OWNER/foo/Foo" '+%s')
 
 is "$before" "$after" \
   "No modification on Foo"
@@ -63,17 +63,17 @@ test-exists \
   "$OWNER/foo/bar/Bar2" \
   "$OWNER/bar/Bar2" \
 
-is "$(cat $OWNER/foo/bar/Bar2)" \
+is "$(cat "$OWNER/foo/bar/Bar2")" \
   "new file Bar2"$'\n'"bar/Bar2" \
   "The readme file in the mainrepo is ours"
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo push bar
 ) &> /dev/null || die
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   git pull
 ) &> /dev/null || die
 
@@ -81,7 +81,7 @@ test-exists \
   "$OWNER/foo/bar/Bar2" \
   "$OWNER/bar/Bar2" \
 
-is "$(cat $OWNER/bar/Bar2)" \
+is "$(cat "$OWNER/bar/Bar2")" \
   "new file Bar2"$'\n'"bar/Bar2" \
   "The readme file in the subrepo is ours"
 
diff --git a/test/pull-theirs.t b/test/pull-theirs.t
index 62cf2335..037ecceb 100644
--- a/test/pull-theirs.t
+++ b/test/pull-theirs.t
@@ -19,26 +19,26 @@ note "Pull - Conflict - Use theirs - Push"
 #
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   add-new-files Bar2
   git push
 ) &> /dev/null || die
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo pull bar
   modify-files-ex bar/Bar2
   git push
 ) &> /dev/null || die
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   modify-files-ex Bar2
   git push
 ) &> /dev/null || die
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo pull bar || {
       cd .git/tmp/subrepo/bar
       git checkout --theirs Bar2
@@ -54,18 +54,18 @@ test-exists \
   "$OWNER/foo/bar/Bar2" \
   "$OWNER/bar/Bar2" \
 
-is "$(cat $OWNER/foo/bar/Bar2)" \
+is "$(cat "$OWNER/foo/bar/Bar2")" \
   "new file Bar2"$'\n'"Bar2" \
   "The readme file in the mainrepo is theirs"
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   cat bar/Bar2
   git subrepo push bar
 ) &> /dev/null || die
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   git pull
 ) &> /dev/null || die
 
@@ -73,7 +73,7 @@ test-exists \
   "$OWNER/foo/bar/Bar2" \
   "$OWNER/bar/Bar2" \
 
-is "$(cat $OWNER/bar/Bar2)" \
+is "$(cat "$OWNER/bar/Bar2")" \
   "new file Bar2"$'\n'"Bar2" \
   "The readme file in the subrepo is theirs"
 
diff --git a/test/pull-twice.t b/test/pull-twice.t
index 092102ad..57db7c64 100644
--- a/test/pull-twice.t
+++ b/test/pull-twice.t
@@ -11,26 +11,26 @@ clone-foo-and-bar
 subrepo-clone-bar-into-foo
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   add-new-files Bar2
   git push
 ) &> /dev/null || die
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   add-new-files bar/Foo2
   git push
   git subrepo pull bar
 ) &> /dev/null || die
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   add-new-files Bar3
   git push
 ) &> /dev/null || die
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo pull bar
 ) &> /dev/null || die
 
diff --git a/test/pull-worktree.t b/test/pull-worktree.t
new file mode 100644
index 00000000..297734c2
--- /dev/null
+++ b/test/pull-worktree.t
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+
+set -e
+
+source test/setup
+
+use Test::More
+
+clone-foo-and-bar
+
+(
+  cd "$OWNER/foo"
+  git subrepo clone ../bar bar
+  git worktree add -b test ../wt
+) &> /dev/null || die
+
+(
+  cd "$OWNER/bar"
+  modify-files Bar
+) &> /dev/null || die
+
+(
+  cd "$OWNER/wt"
+  git subrepo pull --all
+) &> /dev/null || die
+
+(
+  cd "$OWNER/foo"
+  git merge test
+) &> /dev/null || die
+
+{
+  is "$(cat "$OWNER/foo/bar/Bar")" \
+    "a new line" \
+    'bar/Bar content correct'
+}
+
+done_testing
+
+teardown
diff --git a/test/pull.t b/test/pull.t
index 24fb76d1..f7f1938b 100644
--- a/test/pull.t
+++ b/test/pull.t
@@ -11,7 +11,7 @@ clone-foo-and-bar
 subrepo-clone-bar-into-foo
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   add-new-files Bar2
   git push
 ) &> /dev/null || die
@@ -20,10 +20,10 @@ subrepo-clone-bar-into-foo
 # Do the pull and check output:
 {
   is "$(
-    cd $OWNER/foo
+    cd "$OWNER/foo"
     git subrepo pull bar
   )" \
-    "Subrepo 'bar' pulled from '../../../tmp/upstream/bar' (master)." \
+    "Subrepo 'bar' pulled from '$UPSTREAM/bar' (master)." \
     'subrepo pull command output is correct'
 }
 
@@ -37,33 +37,33 @@ gitrepo=$OWNER/foo/bar/.gitrepo
 
 # Test foo/bar/.gitrepo file contents:
 {
-  foo_pull_commit="$(cd $OWNER/foo; git rev-parse HEAD^)"
-  bar_head_commit="$(cd $OWNER/bar; git rev-parse HEAD)"
+  foo_pull_commit=$(cd "$OWNER/foo"; git rev-parse HEAD^)
+  bar_head_commit=$(cd "$OWNER/bar"; git rev-parse HEAD)
   test-gitrepo-comment-block
-  test-gitrepo-field "remote" "../../../$UPSTREAM/bar"
+  test-gitrepo-field "remote" "$UPSTREAM/bar"
   test-gitrepo-field "branch" "master"
   test-gitrepo-field "commit" "$bar_head_commit"
   test-gitrepo-field "parent" "$foo_pull_commit"
-  test-gitrepo-field "cmdver" "`git subrepo --version`"
+  test-gitrepo-field "cmdver" "$(git subrepo --version)"
 }
 
 # Check commit messages
 {
-  foo_new_commit_message="$(cd $OWNER/foo; git log --format=%B -n 1)"
+  foo_new_commit_message=$(cd "$OWNER/foo"; git log --format=%B -n 1)
   like "$foo_new_commit_message" \
       "git subrepo pull bar" \
       "Subrepo pull commit message OK"
-  bar_commit_short="$(git rev-parse --short $bar_head_commit)"
+  bar_commit_short=$(git rev-parse --short "$bar_head_commit")
   like "$foo_new_commit_message" \
-      'merged:   \"'$bar_commit_short \
+      "merged:   \"$bar_commit_short" \
       "Pull commit contains merged"
 }
 
 # Check that we detect that we don't need to pull
 {
   is "$(
-    cd $OWNER/foo
-    git subrepo pull bar 
+    cd "$OWNER/foo"
+    git subrepo pull bar
   )" \
     "Subrepo 'bar' is up to date." \
     'subrepo detects that we dont need to pull'
@@ -72,7 +72,7 @@ gitrepo=$OWNER/foo/bar/.gitrepo
 # Test pull if we have rebased the original subrepo so that our clone
 # commit is no longer present in the history
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   git reset --hard master^^
   add-new-files Bar3
   git push --force
@@ -84,7 +84,7 @@ gitrepo=$OWNER/foo/bar/.gitrepo
 }
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo pull bar || touch pull_failed
 ) &> /dev/null || die
 
@@ -94,6 +94,6 @@ gitrepo=$OWNER/foo/bar/.gitrepo
     "$OWNER/foo/pull_failed"
 }
 
-done_testing # 9
+done_testing
 
 teardown
diff --git a/test/push-after-init.t b/test/push-after-init.t
index c48a04c9..f0be2edd 100644
--- a/test/push-after-init.t
+++ b/test/push-after-init.t
@@ -10,8 +10,8 @@ use Test::More
 # cases when you don't have any previous commits to rely on
 # see issue/122
 (
-  mkdir -p $OWNER/init
-  cd $OWNER/init
+  mkdir -p "$OWNER/init"
+  cd "$OWNER/init"
   git init
   mkdir doc
   add-new-files doc/FooBar
@@ -20,15 +20,16 @@ use Test::More
   git init --bare ../upstream || die
 ) &> /dev/null
 
-output="$(
-  cd $OWNER/init
+output=$(
+  cd "$OWNER/init"
   git subrepo push doc --remote=../upstream
-)"
+)
 
 is "$output" "Subrepo 'doc' pushed to '../upstream' (master)." \
   'Command output is correct'
 
 # Test init/doc/.gitrepo file contents:
+# shellcheck disable=2034
 gitrepo=$OWNER/init/doc/.gitrepo
 {
   test-gitrepo-field "remote" "../upstream"
@@ -36,7 +37,7 @@ gitrepo=$OWNER/init/doc/.gitrepo
 }
 
 (
-  cd $OWNER
+  cd "$OWNER"
   git clone upstream up
 ) &>/dev/null
 
diff --git a/test/push-after-push-no-changes.t b/test/push-after-push-no-changes.t
new file mode 100644
index 00000000..58e1ba8c
--- /dev/null
+++ b/test/push-after-push-no-changes.t
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+set -e
+
+source test/setup
+
+use Test::More
+
+clone-foo-and-bar
+subrepo-clone-bar-into-foo
+
+{
+  message=$(
+    cd "$OWNER/foo"
+    git subrepo push bar > /dev/null
+    add-new-files bar/Bar1
+    catch git subrepo push bar
+  )
+
+  is "$message" \
+    "Subrepo 'bar' pushed to '$UPSTREAM/bar' (master)." \
+    "Output OK: Check that 'push' after an empty push works."
+}
+
+done_testing 1
+
+teardown
diff --git a/test/push-force.t b/test/push-force.t
index 52c34533..129102b0 100644
--- a/test/push-force.t
+++ b/test/push-force.t
@@ -11,19 +11,19 @@ clone-foo-and-bar
 subrepo-clone-bar-into-foo
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   add-new-files Bar2
   git push
 ) &> /dev/null || die
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   add-new-files bar/Foo1
   git subrepo push bar --force
 ) &> /dev/null || die
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo pull bar
 ) &> /dev/null || die
 
@@ -34,17 +34,18 @@ test-exists \
 # Pull here will actually merge the old master with the new one
 (
   set +x
-  cd $OWNER/bar
-  git pull
+  cd "$OWNER/bar"
+  git pull --rebase=false
 ) &> /dev/null || die
 
 test-exists \
   "$OWNER/bar/Bar2" \
   "$OWNER/bar/Foo1" \
 
+
 # Test that a fresh repo is not contaminated
 (
-  git clone $UPSTREAM/bar $OWNER/newbar
+  git clone "$UPSTREAM/bar" "$OWNER/newbar"
 ) &> /dev/null || die
 
 test-exists \
diff --git a/test/push-new-branch.t b/test/push-new-branch.t
index 825128a9..5236b98c 100644
--- a/test/push-new-branch.t
+++ b/test/push-new-branch.t
@@ -11,10 +11,10 @@ clone-foo-and-bar
 # Make various changes to the repos for testing subrepo push:
 (
   # In the main repo:
-  cd $OWNER/foo
+  cd "$OWNER/foo"
 
   # Clone the subrepo into a subdir
-  git subrepo clone ../../../$UPSTREAM/bar
+  git subrepo clone "$UPSTREAM/bar"
 
   # Make a commit:
   add-new-files bar/FooBar
@@ -22,23 +22,23 @@ clone-foo-and-bar
 
 # Do the subrepo push to another branch:
 {
-  message="$(
-    cd $OWNER/foo
+  message=$(
+    cd "$OWNER/foo"
     git subrepo push bar --branch newbar
-  )"
+  )
 
   # Test the output:
   is "$message" \
-    "Subrepo 'bar' pushed to '../../../tmp/upstream/bar' (newbar)." \
+    "Subrepo 'bar' pushed to '$UPSTREAM/bar' (newbar)." \
     'First push message is correct '
 }
 
 # Do the subrepo push to another branch again:
 {
-  message="$(
-    cd $OWNER/foo
+  message=$(
+    cd "$OWNER/foo"
     git subrepo push bar --branch newbar
-  )"
+  )
 
   # Test the output:
   is "$message" \
@@ -48,7 +48,7 @@ clone-foo-and-bar
 
 # Pull the changes from UPSTREAM/bar in OWNER/bar
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   git fetch
   git checkout newbar
 ) &> /dev/null || die
diff --git a/test/push-no-changes.t b/test/push-no-changes.t
index fc21961d..677e9383 100644
--- a/test/push-no-changes.t
+++ b/test/push-no-changes.t
@@ -12,14 +12,14 @@ clone-foo-and-bar
 
 {
   is "$(
-    cd $OWNER/bar
-    git subrepo --quiet clone ../../../$UPSTREAM/foo
+    cd "$OWNER/bar"
+    git subrepo --quiet clone "$UPSTREAM/foo"
     catch git subrepo push foo
   )" \
     "Subrepo 'foo' has no new commits to push." \
     "Output OK: Check that 'push' requires changes to push"
   (
-    cd $OWNER/bar
+    cd "$OWNER/bar"
     git subrepo --quiet clean foo
   )
 }
diff --git a/test/push-squash.t b/test/push-squash.t
index b1438443..598d018b 100644
--- a/test/push-squash.t
+++ b/test/push-squash.t
@@ -11,10 +11,10 @@ clone-foo-and-bar
 # Make various changes to the repos for testing subrepo push:
 (
   # In the main repo:
-  cd $OWNER/foo
+  cd "$OWNER/foo"
 
   # Clone the subrepo into a subdir
-  git subrepo clone ../../../$UPSTREAM/bar
+  git subrepo clone "$UPSTREAM/bar"
 
   # Make a series of commits:
   add-new-files bar/FooBar1
@@ -26,19 +26,19 @@ clone-foo-and-bar
 
 # Do the subrepo push and test the output:
 {
-  message="$(
-    cd $OWNER/foo
+  message=$(
+    cd "$OWNER/foo"
     git subrepo push bar --squash
-  )"
+  )
 
   # Test the output:
   is "$message" \
-    "Subrepo 'bar' pushed to '../../../tmp/upstream/bar' (master)." \
+    "Subrepo 'bar' pushed to '$UPSTREAM/bar' (master)." \
     'push message is correct'
 }
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   git pull
 ) &> /dev/null || die
 
diff --git a/test/push.t b/test/push.t
index 6ee48f86..d1eb2aa9 100644
--- a/test/push.t
+++ b/test/push.t
@@ -13,10 +13,10 @@ clone-foo-and-bar
 # Make various changes to the repos for testing subrepo push:
 (
   # In the main repo:
-  cd $OWNER/foo
+  cd "$OWNER/foo"
 
   # Clone the subrepo into a subdir
-  git subrepo clone ../../../$UPSTREAM/bar
+  git subrepo clone "$UPSTREAM/bar"
 
   # Make a series of commits:
   add-new-files bar/FooBar
@@ -27,37 +27,37 @@ clone-foo-and-bar
 ) &> /dev/null || die
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   add-new-files bargy
   git push
 ) &> /dev/null || die
 
 # Do the subrepo push and test the output:
 {
-  message="$(
-    cd $OWNER/foo
+  message=$(
+    cd "$OWNER/foo"
     git config user.name 'PushUser'
     git config user.email 'push@push'
     git subrepo pull --quiet bar
     git subrepo push bar
-  )"
+  )
 
   # Test the output:
   is "$message" \
-    "Subrepo 'bar' pushed to '../../../tmp/upstream/bar' (master)." \
+    "Subrepo 'bar' pushed to '$UPSTREAM/bar' (master)." \
     'push message is correct'
 }
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   git pull
 ) &> /dev/null || die
 
 {
-  pullCommit="$(
-    cd $OWNER/bar
+  pullCommit=$(
+    cd "$OWNER/bar"
     git log HEAD -1 --pretty='format:%an %ae %cn %ce'
-  )"
+  )
 
   is "$pullCommit" \
     "PushUser push@push PushUser push@push" \
@@ -65,10 +65,10 @@ clone-foo-and-bar
 }
 
 {
-  subrepoCommit="$(
-    cd $OWNER/bar
+  subrepoCommit=$(
+    cd "$OWNER/bar"
     git log HEAD^ -1 --pretty='format:%an %ae %cn %ce'
-  )"
+  )
 
   is "$subrepoCommit" \
     "FooUser foo@foo PushUser push@push" \
@@ -79,39 +79,40 @@ clone-foo-and-bar
 test-commit-count "$OWNER/bar" HEAD 7
 
 # Test foo/bar/.gitrepo file contents:
+# shellcheck disable=2034
 gitrepo=$OWNER/foo/bar/.gitrepo
 {
-  foo_pull_commit="$(cd $OWNER/foo; git rev-parse HEAD^)"
-  bar_head_commit="$(cd $OWNER/bar; git rev-parse HEAD)"
-  test-gitrepo-field "remote" "../../../$UPSTREAM/bar"
+  foo_pull_commit=$(cd "$OWNER/foo"; git rev-parse HEAD^)
+  bar_head_commit=$(cd "$OWNER/bar"; git rev-parse HEAD)
+  test-gitrepo-field "remote" "$UPSTREAM/bar"
   test-gitrepo-field "branch" "master"
   test-gitrepo-field "commit" "$bar_head_commit"
   test-gitrepo-field "parent" "$foo_pull_commit"
-  test-gitrepo-field "cmdver" "`git subrepo --version`"
+  test-gitrepo-field "cmdver" "$(git subrepo --version)"
 }
 
 (
   # In the main repo:
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   add-new-files bar/FooBar2
   modify-files bar/FooBar
 ) &> /dev/null || die
 
 {
-  message="$(
-    cd $OWNER/foo
+  message=$(
+    cd "$OWNER/foo"
     git subrepo push bar
-  )"
+  )
 
   # Test the output:
   is "$message" \
-    "Subrepo 'bar' pushed to '../../../tmp/upstream/bar' (master)." \
+    "Subrepo 'bar' pushed to '$UPSTREAM/bar' (master)." \
     'push message is correct'
 }
 
 # Pull the changes from UPSTREAM/bar in OWNER/bar
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   git pull
 ) &> /dev/null || die
 
@@ -124,7 +125,7 @@ test-exists \
 
 (
   # In the main repo:
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   add-new-files bar/FooBar3
   modify-files bar/FooBar
   git subrepo push bar
@@ -133,20 +134,20 @@ test-exists \
 ) &> /dev/null || die
 
 {
-  message="$(
-    cd $OWNER/foo
+  message=$(
+    cd "$OWNER/foo"
     git subrepo push bar
-  )"
+  )
 
   # Test the output:
   is "$message" \
-    "Subrepo 'bar' pushed to '../../../tmp/upstream/bar' (master)." \
+    "Subrepo 'bar' pushed to '$UPSTREAM/bar' (master)." \
     'Seqential pushes are correct'
 }
 
 (
   # In the subrepo
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   git pull
   add-new-files barBar2
   git push
@@ -154,16 +155,16 @@ test-exists \
 
 (
   # In the main repo:
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   add-new-files bar/FooBar5
   modify-files bar/FooBar3
 ) &> /dev/null || die
 
 {
-  message="$(
-    cd $OWNER/foo
+  message=$(
+    cd "$OWNER/foo"
     git subrepo push bar 2>&1 || true
-  )"
+  )
 
   # Test the output:
   is "$message" \
diff --git a/test/rebase.t b/test/rebase.t
new file mode 100644
index 00000000..ca1da2f6
--- /dev/null
+++ b/test/rebase.t
@@ -0,0 +1,63 @@
+#!/usr/bin/env bash
+
+set -e
+
+source test/setup
+
+use Test::More
+
+# Setup foo with 2 branches, one before the subrepo
+# is added and one after so that we can rebase
+# thus destroying the parent in two ways. The first
+# destroys the second parent, but leave a reference to
+# a merge point. The second such that no history of
+# a merge point exists.
+
+clone-foo-and-bar
+
+(
+    cd "$OWNER/foo"
+    git switch -c branch1
+    add-new-files foo1
+    subrepo-clone-bar-into-foo
+    git branch branch2
+    add-new-files foo2
+) &> /dev/null || die
+
+(
+    cd "$OWNER/bar"
+    add-new-files bar2
+    git push
+) &> /dev/null || die
+
+(
+    cd "$OWNER/foo"
+    # Rebasing onto this merge point will still
+    # be able to find the merge point at branch1
+    git subrepo pull bar
+)
+
+(
+    cd "$OWNER/foo"
+    git switch branch2
+    add-new-files foo-branch2
+    git switch branch1
+    git rebase branch2
+) &> /dev/null || die
+
+# Force subrepo to search of the parent SHA,
+# validate it found the prevous merge point
+{
+    output=$(
+      cd "$OWNER/foo"
+      git subrepo clean --force --all
+      catch git subrepo branch bar
+    )
+
+    like "$output" "caused by a rebase" \
+      "subrepo detected merge point"
+}
+
+done_testing 1
+
+teardown
diff --git a/test/reclone.t b/test/reclone.t
index ff6f451f..0643ca16 100644
--- a/test/reclone.t
+++ b/test/reclone.t
@@ -9,34 +9,41 @@ use Test::More
 clone-foo-and-bar
 
 (
-  cd $OWNER/foo
-  git subrepo --quiet clone ../../../$UPSTREAM/bar
+  cd "$OWNER/foo"
+  git subrepo --quiet clone "$UPSTREAM/bar"
 )
 
 test-exists \
   "$OWNER/foo/bar/bard/"
 
+# Test that reclone is not done if not needed.
 export XYZ=1
 is "$(
-  cd $OWNER/foo
-  git subrepo --force clone ../../../$UPSTREAM/bar
+  cd "$OWNER/foo"
+  git subrepo --force clone "$UPSTREAM/bar"
 )" \
   "Subrepo 'bar' is up to date." \
   "No reclone if same commit"
 
+# Test that reclone of a different ref works.
 (
-  cd $OWNER/foo
-  git subrepo --quiet clone --force ../../../$UPSTREAM/bar --branch=refs/tags/A
+  cd "$OWNER/foo"
+  git subrepo --quiet clone --force "$UPSTREAM/bar" --branch=refs/tags/A
 )
 
+is "$(git -C "$OWNER"/foo subrepo config bar branch)" \
+  "Subrepo 'bar' option 'branch' has value 'refs/tags/A'."
 test-exists \
   "!$OWNER/foo/bar/bard/"
 
+# Test that reclone back to (implicit) master works.
 (
-  cd $OWNER/foo
-  git subrepo --quiet clone -f ../../../$UPSTREAM/bar --branch=master
+  cd "$OWNER/foo"
+  git subrepo --quiet clone -f "$UPSTREAM/bar"
 )
 
+is "$(git -C "$OWNER"/foo subrepo config bar branch)" \
+  "Subrepo 'bar' option 'branch' has value 'master'."
 test-exists \
   "$OWNER/foo/bar/bard/"
 
diff --git a/test/setup b/test/setup
old mode 100644
new mode 100755
index 706a2e69..4c1e977a
--- a/test/setup
+++ b/test/setup
@@ -1,53 +1,125 @@
 #!/usr/bin/env bash
 
+# Set this locally for Windows:
+git config core.autocrlf input
+
 set -e
 
+# Isolate git configuration for tests to ensure consistent behavior
+# across different environments and prevent interference from user's
+# global git configuration
+
+# Set up a temporary home directory for git config
+TEST_HOME=$(mktemp -d)
+export HOME="$TEST_HOME"
+TEMP_GIT_CONFIG="$TEST_HOME/.gitconfig"
+export GIT_CONFIG_GLOBAL="$TEMP_GIT_CONFIG"
+export GIT_CONFIG_SYSTEM=/dev/null
+
+# Set up minimal git configuration for tests
+setup_git_config() {
+  # Core settings
+  git config --global user.name "Test User"
+  git config --global user.email "test@example.com"
+  # Only set init.defaultBranch if Git supports it (Git 2.28+)
+  git_version=$(git --version | sed 's/git version //' | head -1)
+  git_major=$(echo "$git_version" | cut -d. -f1)
+  git_minor=$(echo "$git_version" | cut -d. -f2)
+  if [[ $git_major -gt 2 ]] || [[ $git_major -eq 2 && $git_minor -ge 28 ]]; then
+    git config --global init.defaultBranch "master"
+  fi
+  git config --global core.autocrlf input
+  git config --global core.filemode true
+  git config --global core.bare false
+  git config --global core.logallrefupdates true
+  git config --global core.repositoryformatversion 0
+
+  # Disable interactive prompts
+  git config --global advice.detachedHead false
+  git config --global advice.pushNonFastForward false
+  git config --global advice.statusHints false
+  git config --global advice.commitBeforeMerge false
+  git config --global advice.resolveConflict false
+  git config --global advice.implicitIdentity false
+  git config --global advice.rmHints false
+
+  # Merge/pull settings
+  git config --global merge.tool false
+  git config --global pull.rebase false
+  git config --global push.default simple
+
+  # Color settings (disable for consistent output)
+  git config --global color.ui false
+  git config --global color.branch false
+  git config --global color.diff false
+  git config --global color.status false
+
+  # Security settings
+  git config --global http.sslverify false
+  git config --global receive.advertisePushOptions false
+}
+
+# Set up git configuration for tests
+setup_git_config
+
 # Set the GIT_SUBREPO_ROOT for testing.
-source $PWD/.rc
+source "$PWD"/.rc
 
-# Set this locally for Windows:
-git config core.autocrlf input
+# Get the location of this script
+SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 
-export BASHLIB="`
-  find $PWD -type d |
-  grep -E '/(bin|lib)$' |
-  xargs -n1 printf "%s:"
-`"
-export PATH="$BASHLIB:$PATH"
+BASHLIB=$(
+  find "$PWD"/ -type d -name bin -o -type d -name lib | tr '\n' ':'
+)
+export BASHLIB
+
+export PATH=$BASHLIB:$PATH
+# shellcheck disable=SC1091
 source bash+ :std
 
 source 'lib/git-subrepo'
 
-# TODO: Move to test/tmp
-export TMP="tmp"
-rm -fr $TMP
+export TMP=$SCRIPT_DIR/tmp
+rm -fr "$TMP"
 
-#export GIT_EXEC_PATH="$PWD/lib:$(git --exec-path)"
-export UPSTREAM="$TMP/upstream"
-export OWNER="$TMP/owner"
-export COLLAB="$TMP/collab"
+#export GIT_EXEC_PATH=$PWD/lib:$(git --exec-path)
+export UPSTREAM=$TMP/upstream
+export OWNER=$TMP/owner
+export COLLAB=$TMP/collab
 
 mkdir -p "$UPSTREAM" "$OWNER" "$COLLAB"
 
 cp -r test/repo/{foo,bar,init} "$UPSTREAM/"
 
+# Check if Git supports init.defaultbranch (Git 2.28+)
+git_version=$(git --version | sed 's/git version //' | head -1)
+git_major=$(echo "$git_version" | cut -d. -f1)
+git_minor=$(echo "$git_version" | cut -d. -f2)
+if [[ $git_major -gt 2 ]] || [[ $git_major -eq 2 && $git_minor -ge 28 ]]; then
+  DEFAULTBRANCH=$( git config --global --get init.defaultbranch || true )
+else
+  DEFAULTBRANCH=""
+fi
+[[ -z $DEFAULTBRANCH ]] && DEFAULTBRANCH="master"
+export DEFAULTBRANCH
+
 ###
 # Test helper functions:
 ###
 clone-foo-and-bar() {
   (
     # foo will act as the main repo
-    git clone $UPSTREAM/foo $OWNER/foo
+    git clone "$UPSTREAM/foo" "$OWNER/foo"
     (
-        cd $OWNER/foo
+        cd "$OWNER/foo"
         git config core.autocrlf input
         git config user.name "FooUser"
         git config user.email "foo@foo"
     )
     # bar will act as the subrepo
-    git clone $UPSTREAM/bar $OWNER/bar
+    git clone "$UPSTREAM/bar" "$OWNER/bar"
     (
-        cd $OWNER/bar
+        cd "$OWNER/bar"
         git config core.autocrlf input
         git config user.name "BarUser"
         git config user.email "bar@bar"
@@ -57,23 +129,23 @@ clone-foo-and-bar() {
 
 subrepo-clone-bar-into-foo() {
   (
-    cd $OWNER/foo
-    git subrepo clone ../../../$UPSTREAM/bar
+    cd "$OWNER/foo"
+    git subrepo clone "$UPSTREAM/bar"
   ) &> /dev/null || die
 }
 
 add-new-files() {
   local file
-  for file in $*; do
+  for file in "$@"; do
     echo "new file $file" > "$file"
-    git add "$file"
+    git add --force "$file"
   done
   git commit --quiet -m "add new file: $file" &> /dev/null
 }
 
 remove-files() {
   local file
-  for file in $*; do
+  for file in "$@"; do
     git rm "$file"
   done
   git commit --quiet -m "Removed file: $file" &> /dev/null
@@ -81,7 +153,7 @@ remove-files() {
 
 modify-files() {
   local file
-  for file in $*; do
+  for file in "$@"; do
     echo 'a new line' >> "$file"
     git add "$file"
   done
@@ -90,7 +162,7 @@ modify-files() {
 
 modify-files-ex() {
   local file
-  for file in $*; do
+  for file in "$@"; do
     echo "$file" >> "$file"
     git add "$file"
   done
@@ -100,20 +172,20 @@ modify-files-ex() {
 test-exists() {
   for f in "$@"; do
     if [[ $f =~ ^! ]]; then
-      f="${f#!}"
+      f=${f#!}
       if [[ $f =~ /$ ]]; then
-        ok "`[ ! -d "$f" ]`" \
+        ok "$([ ! -d "$f" ])" \
           "Directory '$f' does not exist"
       else
-        ok "`[ ! -f "$f" ]`" \
+        ok "$([ ! -f "$f" ])" \
           "File '$f' does not exist"
       fi
     else
       if [[ $f =~ /$ ]]; then
-        ok "`[ -d "$f" ]`" \
+        ok "$([ -d "$f" ])" \
           "Directory '$f' exists"
       else
-        ok "`[ -f "$f" ]`" \
+        ok "$([ -f "$f" ])" \
           "File '$f' exists"
       fi
     fi
@@ -121,22 +193,22 @@ test-exists() {
 }
 
 test-exists-in-index() {
-  for f in $*; do
-    if [[ "$f" =~ ^! ]]; then
-      f="${f#!}"
-      if [[ "$f" =~ /$ ]]; then
-        ok "`[ ! $(git ls-tree --full-tree --name-only -r HEAD "$f") ]`" \
+  for f in "$@"; do
+    if [[ $f =~ ^! ]]; then
+      f=${f#!}
+      if [[ $f =~ /$ ]]; then
+        ok "$([ ! "$(git ls-tree --full-tree --name-only -r HEAD "$f")" ])" \
           "Directory '$f' does not exist in index"
       else
-        ok "`[ ! $(git ls-tree --full-tree --name-only -r HEAD "$f") ]`" \
+        ok "$([ ! "$(git ls-tree --full-tree --name-only -r HEAD "$f")" ])" \
           "File '$f' does not exist in index"
       fi
     else
-      if [[ "$f" =~ /$ ]]; then
-        ok "`[ $(git ls-tree --full-tree --name-only -r HEAD "$f") ]`" \
+      if [[ $f =~ /$ ]]; then
+        ok "$([ "$(git ls-tree --full-tree --name-only -r HEAD "$f")" ])" \
           "Directory '$f' exists in index"
       else
-        ok "`[ $(git ls-tree --full-tree --name-only -r HEAD "$f") ]`" \
+        ok "$([ "$(git ls-tree --full-tree --name-only -r HEAD "$f")" ])" \
           "File '$f' exists in index"
       fi
     fi
@@ -144,39 +216,40 @@ test-exists-in-index() {
 }
 
 test-gitrepo-comment-block() {
-  is "$(grep -E '^;' $gitrepo)" "\
+  # shellcheck disable=2154
+  is "$(grep -E '^;' "$gitrepo")" "\
 ; DO NOT EDIT (unless you know what you are doing)
 ;
 ; This subdirectory is a git \"subrepo\", and this file is maintained by the
-; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
+; git-subrepo command. See https://github.com/ingydotnet/git-subrepo#readme
 ;" \
     'Comment header block is correct'
 }
 
 test-gitrepo-field() {
-  is "`git config -f $gitrepo subrepo.$1`" \
+  is "$(git config -f "$gitrepo" subrepo."$1")" \
     "$2" \
     ".gitrepo $1 is correct"
 }
 
 test-commit-count() {
-  is "`cd $1; git rev-list --count $2`" \
+  is "$(cd "$1"; git rev-list --count "$2")" \
     "$3" \
     "commit count is correct"
 }
 
 save-original-state() {
-  original_head_ref="$(cd $1; cat .git/HEAD)"
-  original_branch="${original_head_ref#ref: refs/heads/}"
-  original_head_commit="$(cd $1; git rev-parse HEAD)"
-  original_gitrepo="$(cd $1; cat $2/.gitrepo)"
+  original_head_ref=$(cd "$1"; cat .git/HEAD)
+  original_branch=${original_head_ref#ref: refs/heads/}
+  original_head_commit=$(cd "$1"; git rev-parse HEAD)
+  original_gitrepo=$(cd "$1"; cat "$2"/.gitrepo)
 }
 
 assert-original-state() {
-  current_head_ref="$(cd $1; cat .git/HEAD)"
-  current_branch="${current_head_ref#ref: refs/heads/}"
-  current_head_commit="$(cd $1; git rev-parse HEAD)"
-  current_gitrepo="$(cd $1; cat $2/.gitrepo)"
+  current_head_ref=$(cd "$1"; cat .git/HEAD)
+  current_branch=${current_head_ref#ref: refs/heads/}
+  current_head_commit=$(cd "$1"; git rev-parse HEAD)
+  current_gitrepo=$(cd "$1"; cat "$2"/.gitrepo)
 
   is "$current_head_ref" \
     "$original_head_ref" \
@@ -196,10 +269,12 @@ assert-original-state() {
 }
 
 catch() {
-  local error=; error="$("$@" 2>&1 || true)"
+  local error=; error=$("$@" 2>&1 || true)
   echo "$error"
 }
 
 teardown() {
-  rm -fr $TMP
+  rm -fr "$TMP"
+  # Clean up temporary home directory and git config
+  [[ -n "$TEST_HOME" && -d "$TEST_HOME" ]] && rm -rf "$TEST_HOME"
 }
diff --git a/test/status.t b/test/status.t
index b6a7fe61..e4788b9d 100644
--- a/test/status.t
+++ b/test/status.t
@@ -6,61 +6,81 @@ source test/setup
 
 use Test::More
 
+clone-foo-and-bar
+
+(
+  cd "$OWNER"/foo
+  git subrepo clone "$UPSTREAM"/bar
+  git subrepo clone "$UPSTREAM"/foo bar/foo
+  mkdir lib
+  git subrepo clone "$UPSTREAM"/bar lib/bar
+  git subrepo clone "$UPSTREAM"/foo lib/bar/foo
+) &> /dev/null || die
+
 {
-  output="$(git subrepo status)"
+  output=$(
+    cd "$OWNER"/foo
+    git subrepo status --all
+  )
 
   like "$output" "2 subrepos:" \
     "'status' intro ok"
 
-  like "$output" "Git subrepo 'ext/bashplus':" \
-    "ext/bashplus is in 'status'"
+  like "$output" "Git subrepo 'bar':" \
+    "bar is in 'status'"
 
-  like "$output" "Git subrepo 'ext/test-more-bash':" \
-    "ext/test-more-bash is in 'status'"
+  like "$output" "Git subrepo 'lib/bar':" \
+    "lib/bar is in 'status'"
 
-  unlike "$output" "Git subrepo 'ext/test-more-bash/ext/bashplus':" \
-    "ext/test-more-bash/ext/bashplus is not in 'status'"
+  unlike "$output" "Git subrepo 'bar/foo':" \
+    "bar/foo is not in 'status'"
 
-  unlike "$output" "Git subrepo 'ext/test-more-bash/ext/test-tap-bash':" \
-    "ext/test-more-bash/ext/test-tap-bash is not in 'status'"
+  unlike "$output" "Git subrepo 'lib/bar/foo':" \
+    "lib/bar/foo is not in 'status'"
 }
 
 {
-  output="$(git subrepo status --ALL)"
+  output=$(
+    cd "$OWNER"/foo
+    git subrepo status --ALL
+  )
 
   like "$output" "4 subrepos:" \
     "'status --ALL' intro ok"
 
-  like "$output" "Git subrepo 'ext/bashplus':" \
-    "ext/bashplus is in 'status --ALL'"
+  like "$output" "Git subrepo 'bar':" \
+    "bar is in 'status --ALL'"
 
-  like "$output" "Git subrepo 'ext/test-more-bash':" \
-    "ext/test-more-bash is in 'status --ALL'"
+  like "$output" "Git subrepo 'lib/bar':" \
+    "lib/bar is in 'status --ALL'"
 
-  like "$output" "Git subrepo 'ext/test-more-bash/ext/bashplus':" \
-    "ext/test-more-bash/ext/bashplus is in 'status --ALL'"
+  like "$output" "Git subrepo 'bar/foo':" \
+    "bar/foo is in 'status --ALL'"
 
-  like "$output" "Git subrepo 'ext/test-more-bash/ext/test-tap-bash':" \
-    "ext/test-more-bash/ext/test-tap-bash is in 'status --ALL'"
+  like "$output" "Git subrepo 'lib/bar/foo':" \
+    "lib/bar/foo is in 'status --ALL'"
 }
 
 {
-  output="$(git subrepo status --all)"
+  output=$(
+    cd "$OWNER"/foo
+    git subrepo status --all
+  )
 
   like "$output" "2 subrepos:" \
     "'status --all' intro ok"
 
-  like "$output" "Git subrepo 'ext/bashplus':" \
-    "ext/bashplus is in 'status --all'"
+  like "$output" "Git subrepo 'bar':" \
+    "bar is in 'status --all'"
 
-  like "$output" "Git subrepo 'ext/test-more-bash':" \
-    "ext/test-more-bash is in 'status --all'"
+  like "$output" "Git subrepo 'lib/bar':" \
+    "lib/bar is in 'status --all'"
 
-  unlike "$output" "Git subrepo 'ext/test-more-bash/ext/bashplus':" \
-    "ext/test-more-bash/ext/bashplus is not in 'status --all'"
+  unlike "$output" "Git subrepo 'bar/foo':" \
+    "bar/foo is not in 'status --all'"
 
-  unlike "$output" "Git subrepo 'ext/test-more-bash/ext/test-tap-bash':" \
-    "ext/test-more-bash/ext/test-tap-bash is not in 'status --all'"
+  unlike "$output" "Git subrepo 'lib/bar/foo':" \
+    "lib/bar/foo is not in 'status --all'"
 }
 
 done_testing 15
diff --git a/test/submodule.t b/test/submodule.t
index 75b8f2aa..774a9f60 100644
--- a/test/submodule.t
+++ b/test/submodule.t
@@ -14,7 +14,7 @@ clone-foo-and-bar
 
 # Add submodule reference along with a new file to the bar repo:
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   git clone ../foo submodule
   add-new-files file
   git add submodule file
@@ -22,18 +22,18 @@ clone-foo-and-bar
 ) &> /dev/null || die
 
 (
-  cd $OWNER/foo
+  cd "$OWNER/foo"
   git subrepo clone ../bar
 ) &> /dev/null || die
 
 (
-  cd $OWNER/bar
+  cd "$OWNER/bar"
   modify-files file
 ) &> /dev/null || die
 
 {
   is "$(
-   cd $OWNER/foo
+   cd "$OWNER/foo"
     git subrepo pull bar
   )" \
     "Subrepo 'bar' pulled from '../bar' (master)." \
diff --git a/test/zsh.t b/test/zsh.t
new file mode 100644
index 00000000..3e9f6c15
--- /dev/null
+++ b/test/zsh.t
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+set -e
+
+source test/setup
+
+use Test::More
+
+if ! command -v docker >/dev/null; then
+  plan skip_all "The 'docker' utility is not installed"
+fi
+
+for zsh_version in 5.8 5.6 5.0.1 4.3.11; do
+  error=$(
+    docker run --rm -it \
+      --volume="$PWD:/git-subrepo" \
+      --entrypoint='' \
+        "zshusers/zsh:$zsh_version" \
+        zsh -c 'source /git-subrepo/.rc 2>&1'
+  ) || true
+
+  is "$error" "" "'source.rc' works for zsh-$zsh_version"
+done
+
+done_testing
+
+# vim: set ft=sh: