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 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 |--all [-r ] [-b ] >> +=item C<< git subrepo fetch |--force --all [-r ] [-b ] >> Fetch the remote/upstream content for a subrepo. @@ -259,7 +259,7 @@ points at the same commit as C. It will also create a remote called C<< subrepo/ >>. These are temporary and you can easily remove them with the subrepo C command. -The C command accepts the C<--all>, C<--branch=> and C<--remote=> options. +The C command accepts the C<--force>, C<--all>, C<--branch=> and C<--remote=> options. =item C<< git subrepo branch |--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 |--all [-r ] [-b ]` +- `git subrepo fetch |--force --all [-r ] [-b ]` Fetch the remote/upstream content for a subrepo. @@ -223,7 +223,7 @@ the same arguments. Keep reading… `subrepo/`. 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 |--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 |--all|--ALL [-f] clone clone [] [-b ] [-f] [-m ] [--file=] [-e] [--method ] commit commit [] [-m ] [--file=] [-e] [-f] [-F] config config