eac_git 0.18.1 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee396b6b06ed9d87b501637c01bf2a61a812c94938c57b1407819a6822d26c0e
-  data.tar.gz: 0bb3f62418b2640ab52223ea909afcff060071d4b0b42012a3ef251b41a20943
+  metadata.gz: 97abca2bae305c62a10830e563e640d9b9373fcb05af38b5e0c7ccd31fdb9158
+  data.tar.gz: 39ceeb6a1df4e4c03dda2207418d65b34c09f268a297bf250aa3bb8e8407e41f
 SHA512:
-  metadata.gz: cda81b1f0c0af6002580adc0b9189b93eab526a2ad0bf6b1e71eca8920f4dba0fbc5b0a346dc17c960f35d6856b828a53f740ada0ff09eb3e6cd0885975b92b7
-  data.tar.gz: b7ef974068c4e32323e3a18a52d82bcf9d450813df5b6874c90b8d2516b88ec7ac4b581a6f091572bfdee43192bcf8b8749a0b0c2a84b789a676eae730e73fca
+  metadata.gz: 7a388edee6bb00a8e2fe9a6e110bbb4ab59eb23927192080c57ad587346bab65ed62b8dc7391e52ee44c71e8f48f7fcf6fea611fd3a77701bed464d657cdd38c
+  data.tar.gz: 00b092015373876a2617953681e0ae32da4cc25f19a673a56d4b43e08617eae07fb1abeb1b5dc09ff0a41c60ecbcc579ee23dc6b560093c65045c98d73afb18d

data/lib/eac_git/local/remote.rb

@@ -40,8 +40,6 @@ module EacGit
       def url=(new_url)
         local.command('remote', 'set-url', name, new_url).execute!
       end
-
-      require_sub __FILE__
     end
   end
 end

data/lib/eac_git/local/subrepo/config.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'parseconfig'
+
 module EacGit
   class Local
     class Subrepo

data/lib/eac_git/remote_like/ls_result.rb

@@ -6,7 +6,7 @@ module EacGit
       class << self
         def by_ls_remote_command_output(output)
           new(
-            output.each_line.map { |line| line.strip.split(/\s+/) }.to_h { |x| [x[1], x[0]] } # rubocop:disable Style/MapToHash
+            output.each_line.map { |line| line.strip.split(/\s+/) }.to_h { |x| [x[1], x[0]] }
           )
         end
       end

data/lib/eac_git/remote_like.rb

@@ -2,7 +2,6 @@
 
 module EacGit
   module RemoteLike
-    require_sub __FILE__
     enable_abstract_methods
 
     # @return [String] The output of command "git fetch".

data/lib/eac_git/rspec/stubbed_git_local_repo.rb

@@ -21,8 +21,6 @@ module EacGit
         r << '--bare' if bare
         r + [path]
       end
-
-      require_sub __FILE__
     end
   end
 end

data/lib/eac_git/rspec.rb

@@ -2,6 +2,5 @@
 
 module EacGit
   module Rspec
-    require_sub __FILE__
   end
 end

data/lib/eac_git/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacGit
-  VERSION = '0.18.1'
+  VERSION = '0.18.2'
 end

data/lib/eac_git.rb

@@ -3,7 +3,5 @@
 require 'eac_ruby_utils'
 EacRubyUtils::RootModuleSetup.perform __FILE__
 
-require 'parseconfig'
-
 module EacGit
 end

data/vendor/git-subrepo/.fish.rc

@@ -0,0 +1,20 @@
+#!fish
+
+#------------------------------------------------------------------------------
+#
+# 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

data/vendor/git-subrepo/.gitattributes

@@ -0,0 +1 @@
+* text eol=lf

data/vendor/git-subrepo/.github/workflows/test.yml

@@ -0,0 +1,29 @@
+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@v2
+    - 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 docker-tests

data/vendor/git-subrepo/.gitignore

@@ -0,0 +1 @@
+/test/tmp/

data/vendor/git-subrepo/.gitrepo

@@ -0,0 +1,7 @@
+[subrepo]
+  cmdver = 0.4.9
+  commit = a15c74247acfca764711e5589e77d79472fcaab4
+  method = merge
+  parent = 84ec4ccc74f3d3542195d2204c4d7f6b52c86832
+  branch = master
+  remote = https://github.com/esquilo-azul/git-subrepo.git

data/vendor/git-subrepo/.rc

@@ -0,0 +1,32 @@
+# shellcheck shell=bash disable=2128
+
+#------------------------------------------------------------------------------
+#
+# This is the `git-subrepo` initialization script.
+#
+# This script turns on the `git-subrepo` Git subcommand, its manpages and TAB
+# completion for the *Bash* and *zsh* shells.
+#
+# Just add a line like this to your shell startup configuration:
+#
+#   source /path/to/git-subrepo/.rc
+#
+#------------------------------------------------------------------------------
+
+[[ -n ${ZSH_VERSION-} ]] &&
+  GIT_SUBREPO_ROOT=$0 ||
+  GIT_SUBREPO_ROOT=$BASH_SOURCE
+
+[[ $GIT_SUBREPO_ROOT =~ ^/ ]] ||
+  GIT_SUBREPO_ROOT=$PWD/$GIT_SUBREPO_ROOT
+
+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"

data/vendor/git-subrepo/Changes

@@ -1,3 +1,69 @@
+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

data/vendor/git-subrepo/Intro.pod

@@ -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,13 +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
 
-=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>
-
 Bad:
 
 =over

data/vendor/git-subrepo/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,18 @@ INSTALL_LIB  ?= $(DESTDIR)$(shell git --exec-path)
 INSTALL_EXT  ?= $(INSTALL_LIB)/$(NAME).d
 INSTALL_MAN1 ?= $(DESTDIR)$(PREFIX)/share/man/man1
 
+# Docker variables:
+DOCKER_TAG ?= 0.0.6
+DOCKER_IMAGE := ingy/bash-testing:$(DOCKER_TAG)
+BASH_VERSIONS ?= 5.1 5.0 4.4 4.3 4.2 4.1 4.0
+DOCKER_TESTS := $(BASH_VERSIONS:%=docker-test-%)
+GIT_VERSIONS := 2.45 2.40 2.30 2.29 2.25 2.17 2.7
+
+prove ?=
+test ?= test/
+bash ?= 5.1
+git ?= 2.45
+
 # Basic targets:
 default: help
 
@@ -32,14 +46,24 @@ help:
 
 .PHONY: test
 test:
-	prove $(PROVEOPT:%=% )test/
+	prove $(prove) $(test)
+
+test-all: test docker-tests
+
+docker-test:
+	$(call docker-make-test,$(bash),$(git))
+
+docker-tests: $(DOCKER_TESTS)
+
+$(DOCKER_TESTS):
+	$(call docker-make-test,$(@:docker-test-%=%),$(git))
 
 # Install support:
 install:
 	install -d -m 0755 $(INSTALL_LIB)/
 	install -C -m 0755 $(LIB) $(INSTALL_LIB)/
 	install -d -m 0755 $(INSTALL_EXT)/
-	install -C -m 0755 $(EXTS) $(INSTALL_EXT)/
+	install -C -m 0644 $(EXTS) $(INSTALL_EXT)/
 	install -d -m 0755 $(INSTALL_MAN1)/
 	install -C -m 0644 $(MAN1)/$(NAME).1 $(INSTALL_MAN1)/
 
@@ -78,5 +102,21 @@ compgen: force
 	perl pkg/bin/generate-completion.pl zsh $(DOC) $(LIB) > \
 	    $(SHARE)/zsh-completion/_git-subrepo
 
-clean purge:
-	rm -fr tmp
+clean:
+	rm -fr tmp test/tmp
+
+define docker-make-test
+	docker run --rm \
+	    -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

data/vendor/git-subrepo/Meta

@@ -1,11 +1,11 @@
 =meta: 0.0.2
 
 name: git-subrepo
-version: 0.4.1
+version: 0.4.9
 abstract: Git Submodule Alternative
 homepage: https://github.com/ingydotnet/git-subrepo#readme
 license: MIT
-copyright: 2013-2020
+copyright: 2013-2024
 
 author:
   name: Ingy döt Net

data/vendor/git-subrepo/ReadMe.pod

@@ -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
@@ -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.
 
@@ -226,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.
 
@@ -253,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.
 
@@ -266,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] >>
 
@@ -283,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.
 
@@ -296,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.
 
@@ -419,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.
@@ -489,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>
 
@@ -649,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
@@ -687,6 +680,8 @@ C<irc.freenode.net>.
 
 =item * Magnus Carlsson <grimmymail@gmail.com>
 
+=item * Austin Morgan <admorgan@morgancomputers.net>
+
 =back
 
 =head1 License and Copyright

data/vendor/git-subrepo/doc/git-subrepo.swim

@@ -3,8 +3,6 @@ git-subrepo
 
 Git Submodule Alternative
 
-<badge travis ingydotnet/git-subrepo>
-
 = Synopsis
 
   git subrepo -h    # Help Overview
@@ -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.
 
@@ -185,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.
 
@@ -212,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.
 
@@ -224,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]`
 
@@ -239,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.
 
@@ -252,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]`
 
@@ -370,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.
@@ -574,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,6 +603,7 @@ If you want to chat about the `git-subrepo` command, join `#gitcommands` on
 
 * Ingy döt Net <ingy@ingy.net>
 * Magnus Carlsson <grimmymail@gmail.com>
+* Austin Morgan <admorgan@morgancomputers.net>
 
 = License and Copyright