From 3a53c200f86c97af697b8047ed04dda31a1d23bb Mon Sep 17 00:00:00 2001
From: Austin Morgan <admorgan@morgancomputers.net>
Date: Mon, 22 Jul 2024 08:14:22 -0500
Subject: [PATCH] Release 0.4.8

- 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
---
 Changes                               | 12 ++++++++++++
 Meta                                  |  2 +-
 ReadMe.pod                            |  4 ++--
 doc/git-subrepo.swim                  |  4 ++--
 lib/git-subrepo                       |  2 +-
 lib/git-subrepo.d/help-functions.bash |  6 +++---
 man/man1/git-subrepo.1                | 12 ++++++------
 7 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/Changes b/Changes
index aed5a787..02d09a9c 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,15 @@
+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
diff --git a/Meta b/Meta
index eacc1908..6b173775 100644
--- a/Meta
+++ b/Meta
@@ -1,7 +1,7 @@
 =meta: 0.0.2
 
 name: git-subrepo
-version: 0.4.7
+version: 0.4.8
 abstract: Git Submodule Alternative
 homepage: https://github.com/ingydotnet/git-subrepo#readme
 license: MIT
diff --git a/ReadMe.pod b/ReadMe.pod
index faca2c72..a3e6daba 100644
--- a/ReadMe.pod
+++ b/ReadMe.pod
@@ -250,7 +250,7 @@ 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<--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.
 
@@ -259,7 +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] >>
 
diff --git a/doc/git-subrepo.swim b/doc/git-subrepo.swim
index 3560df88..a2f50764 100644
--- a/doc/git-subrepo.swim
+++ b/doc/git-subrepo.swim
@@ -214,7 +214,7 @@ the same arguments. Keep reading…
   `--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.
 
@@ -223,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]`
 
diff --git a/lib/git-subrepo b/lib/git-subrepo
index ec65d308..2e9eda66 100755
--- a/lib/git-subrepo
+++ b/lib/git-subrepo
@@ -17,7 +17,7 @@ source "${SUBREPO_EXT_DIR}/bash+.bash"
 bash+:import :std can version-check
 
 
-VERSION=0.4.7
+VERSION=0.4.8
 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
diff --git a/lib/git-subrepo.d/help-functions.bash b/lib/git-subrepo.d/help-functions.bash
index 6dd5c176..c7fc64db 100644
--- a/lib/git-subrepo.d/help-functions.bash
+++ b/lib/git-subrepo.d/help-functions.bash
@@ -9,7 +9,7 @@ clean                clean <subdir>|--all|--ALL [-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>] [--file=<msg file>] [-e] [-b <branch>] [-r <remote>] [-u]
@@ -140,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.
@@ -150,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.
 ...
 }
 
diff --git a/man/man1/git-subrepo.1 b/man/man1/git-subrepo.1
index 47888c57..434fde98 100644
--- a/man/man1/git-subrepo.1
+++ b/man/man1/git-subrepo.1
@@ -1,5 +1,5 @@
 .\" -*- mode: troff; coding: utf-8 -*-
-.\" Automatically generated by Pod::Man 5.01 (Pod::Simple 3.43)
+.\" Automatically generated by Pod::Man 5.0102 (Pod::Simple 3.45)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -55,7 +55,7 @@
 .\" ========================================================================
 .\"
 .IX Title "STDIN 1"
-.TH STDIN 1 2024-07-07 "Generated by Swim v0.1.48" "Git Submodule Alternative"
+.TH STDIN 1 2024-07-22 "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
@@ -296,9 +296,9 @@ discouraged. Only use this option if you fully understand it. (The \f(CW\*(C`\-\
 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>|\-\-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>]"
+.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
@@ -306,7 +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]"