Skip to content

Commit

Permalink
Release 0.4.8
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
admorgan committed Jul 22, 2024
1 parent 7816a57 commit 3a53c20
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 15 deletions.
12 changes: 12 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Meta
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions ReadMe.pod
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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] >>

Expand Down
4 changes: 2 additions & 2 deletions doc/git-subrepo.swim
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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]`

Expand Down
2 changes: 1 addition & 1 deletion lib/git-subrepo
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions lib/git-subrepo.d/help-functions.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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.
Expand All @@ -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.
...
}

Expand Down
12 changes: 6 additions & 6 deletions man/man1/git-subrepo.1
Original file line number Diff line number Diff line change
@@ -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:
.\" ========================================================================
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -296,17 +296,17 @@ 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
points at the same commit as \f(CW\*(C`FETCH_HEAD\*(C'\fR. It will also create a remote
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]"
Expand Down

0 comments on commit 3a53c20

Please sign in to comment.