0.4.7

.github/workflows/test.yml

@@ -20,4 +20,10 @@ jobs:
     - run:
         git config --global user.email "[email protected]";
         git config --global user.name "Your Name";
-    - run: make test
+        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

Changes

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

Makefile

@@ -22,16 +22,16 @@ INSTALL_EXT  ?= $(INSTALL_LIB)/$(NAME).d
 INSTALL_MAN1 ?= $(DESTDIR)$(PREFIX)/share/man/man1
 
 # Docker variables:
-DOCKER_TAG ?= 0.0.4
+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.29 2.25 2.17 2.7
+GIT_VERSIONS := 2.45 2.40 2.30 2.29 2.25 2.17 2.7
 
 prove ?=
 test ?= test/
-bash ?= 5.0
-git ?= 2.29
+bash ?= 5.1
+git ?= 2.45
 
 # Basic targets:
 default: help
@@ -106,7 +106,7 @@ clean:
 	rm -fr tmp test/tmp
 
 define docker-make-test
-	docker run -i -t --rm \
+	docker run --rm \
 	    -v $(PWD):/git-subrepo \
 	    -w /git-subrepo \
 	    $(DOCKER_IMAGE) \

Meta

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

ReadMe.pod

@@ -642,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

doc/git-subrepo.swim

@@ -577,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`).

lib/git-subrepo

@@ -30,7 +30,7 @@ fi
 bash+:import :std can version-check
 
 
-VERSION=0.4.6
+VERSION=0.4.7
 REQUIRED_BASH_VERSION=4.0
 REQUIRED_GIT_VERSION=2.7.0
 GIT_TMP=$(git rev-parse --git-common-dir 2> /dev/null || echo .git)/tmp
@@ -166,7 +166,7 @@ main() {
     # 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=
@@ -1245,11 +1245,11 @@ get-params() {
       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