stackriot · pull · May 21, 2018 · May 24, 2019 · Feb 7, 2017 · Apr 8, 2019
diff --git a/.fish.rc b/.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
diff --git a/.github/workflows/test.yml b/.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 "[email protected]";
+        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
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+/test/tmp/
diff --git 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
diff --git 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
@@ -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 [email protected]:user/abc master
-    $ git subrepo add xyz [email protected]:user/def master
-    $ git subrepo pull abc [email protected]:user/abc master
-    $ git subrepo pull xyz [email protected]:user/def master
+    $ git subtree add abc [email protected]:user/abc master
+    $ git subtree add xyz [email protected]:user/def master
+    $ git subtree pull abc [email protected]:user/abc master
+    $ git subtree pull xyz [email protected]:user/def master
 
 Produces this:
 

diff --git 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
@@ -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,15 +46,25 @@ 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 -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 +81,42 @@ 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
 
-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
diff --git 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.7.0
 test:
   cmd: make test
 install: make install