Skip to content

Commit 3a53c20

Browse files
committed
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
1 parent 7816a57 commit 3a53c20

File tree

7 files changed

+27
-15
lines changed

7 files changed

+27
-15
lines changed

Changes

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
version: 0.4.8
2+
date: Mon 22 Jul 2024 07:40:00 AM CST
3+
- Remove all subrepo refs with clean --force
4+
- Allow the error() function to accept multiple arguments
5+
- Bug fixed where clone --force could change the tracked branch
6+
- Give a detailed error message if the parent SHA could not be found
7+
- Use the git configuration to determine the default branch name for the init command
8+
- Add --force to fetch command
9+
- Fix executable settings on installed files
10+
- Remove shebangs from library only files
11+
- Fix bash-completion for instances that used make install
12+
---
113
version: 0.4.7
214
date: Sun 7 Jul 2024 11:04:00 AM EST
315
- Convert testing to use docker with updated git versions

Meta

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
=meta: 0.0.2
22

33
name: git-subrepo
4-
version: 0.4.7
4+
version: 0.4.8
55
abstract: Git Submodule Alternative
66
homepage: https://github.com/ingydotnet/git-subrepo#readme
77
license: MIT

ReadMe.pod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ option will NOT check for a proper merge. ANY branch will be force pushed!)
250250

251251
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.
252252

253-
=item C<< git subrepo fetch <subdir>|--all [-r <remote>] [-b <branch>] >>
253+
=item C<< git subrepo fetch <subdir>|--force --all [-r <remote>] [-b <branch>] >>
254254

255255
Fetch the remote/upstream content for a subrepo.
256256

@@ -259,7 +259,7 @@ points at the same commit as C<FETCH_HEAD>. It will also create a remote
259259
called C<< subrepo/<subdir> >>. These are temporary and you can easily remove
260260
them with the subrepo C<clean> command.
261261

262-
The C<fetch> command accepts the C<--all>, C<--branch=> and C<--remote=> options.
262+
The C<fetch> command accepts the C<--force>, C<--all>, C<--branch=> and C<--remote=> options.
263263

264264
=item C<< git subrepo branch <subdir>|--all [-f] [-F] >>
265265

doc/git-subrepo.swim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ the same arguments. Keep reading…
214214
`--force`, `--merge`, `--message`, `--rebase`, `--remote=`, `--squash` and
215215
`--update` options.
216216

217-
- `git subrepo fetch <subdir>|--all [-r <remote>] [-b <branch>]`
217+
- `git subrepo fetch <subdir>|--force --all [-r <remote>] [-b <branch>]`
218218

219219
Fetch the remote/upstream content for a subrepo.
220220

@@ -223,7 +223,7 @@ the same arguments. Keep reading…
223223
`subrepo/<subdir>`. These are temporary and you can easily remove them with
224224
the subrepo `clean` command.
225225

226-
The `fetch` command accepts the `--all`, `--branch=` and `--remote=` options.
226+
The `fetch` command accepts the `--force`, `--all`, `--branch=` and `--remote=` options.
227227

228228
- `git subrepo branch <subdir>|--all [-f] [-F]`
229229

lib/git-subrepo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ source "${SUBREPO_EXT_DIR}/bash+.bash"
1717
bash+:import :std can version-check
1818

1919

20-
VERSION=0.4.7
20+
VERSION=0.4.8
2121
REQUIRED_BASH_VERSION=4.0
2222
REQUIRED_GIT_VERSION=2.7.0
2323
GIT_TMP=$(git rev-parse --git-common-dir 2> /dev/null || echo .git)/tmp

lib/git-subrepo.d/help-functions.bash

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ clean clean <subdir>|--all|--ALL [-f]
99
clone clone <repository> [<subdir>] [-b <branch>] [-f] [-m <msg>] [--file=<msg file>] [-e] [--method <merge|rebase>]
1010
commit commit <subdir> [<subrepo-ref>] [-m <msg>] [--file=<msg file>] [-e] [-f] [-F]
1111
config config <subdir> <option> [<value>] [-f]
12-
fetch fetch <subdir>|--all [-r <remote>] [-b <branch>]
12+
fetch fetch <subdir>|--force --all [-r <remote>] [-b <branch>]
1313
help help [<command>|--all]
1414
init init <subdir> [-r <remote>] [-b <branch>] [--method <merge|rebase>]
1515
pull pull <subdir>|--all [-M|-R|-f] [-m <msg>] [--file=<msg file>] [-e] [-b <branch>] [-r <remote>] [-u]
@@ -140,7 +140,7 @@ help:config() {
140140
help:fetch() {
141141
cat <<'...'
142142
143-
Usage: git subrepo fetch <subdir>|--all [-r <remote>] [-b <branch>]
143+
Usage: git subrepo fetch <subdir>|--force --all [-r <remote>] [-b <branch>]
144144
145145
146146
Fetch the remote/upstream content for a subrepo.
@@ -150,7 +150,7 @@ help:fetch() {
150150
`subrepo/<subdir>`. These are temporary and you can easily remove them with
151151
the subrepo `clean` command.
152152
153-
The `fetch` command accepts the `--all`, `--branch=` and `--remote=` options.
153+
The `fetch` command accepts the `--force`, `--all`, `--branch=` and `--remote=` options.
154154
...
155155
}
156156

man/man1/git-subrepo.1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.\" -*- mode: troff; coding: utf-8 -*-
2-
.\" Automatically generated by Pod::Man 5.01 (Pod::Simple 3.43)
2+
.\" Automatically generated by Pod::Man 5.0102 (Pod::Simple 3.45)
33
.\"
44
.\" Standard preamble:
55
.\" ========================================================================
@@ -55,7 +55,7 @@
5555
.\" ========================================================================
5656
.\"
5757
.IX Title "STDIN 1"
58-
.TH STDIN 1 2024-07-07 "Generated by Swim v0.1.48" "Git Submodule Alternative"
58+
.TH STDIN 1 2024-07-22 "Generated by Swim v0.1.48" "Git Submodule Alternative"
5959
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
6060
.\" way too many mistakes in technical documents.
6161
.if n .ad l
@@ -296,17 +296,17 @@ discouraged. Only use this option if you fully understand it. (The \f(CW\*(C`\-\
296296
option will NOT check for a proper merge. ANY branch will be force pushed!)
297297
.Sp
298298
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.
299-
.ie n .IP """git subrepo fetch <subdir>|\-\-all [\-r <remote>] [\-b <branch>]""" 4
300-
.el .IP "\f(CWgit subrepo fetch <subdir>|\-\-all [\-r <remote>] [\-b <branch>]\fR" 4
301-
.IX Item "git subrepo fetch <subdir>|--all [-r <remote>] [-b <branch>]"
299+
.ie n .IP """git subrepo fetch <subdir>|\-\-force \-\-all [\-r <remote>] [\-b <branch>]""" 4
300+
.el .IP "\f(CWgit subrepo fetch <subdir>|\-\-force \-\-all [\-r <remote>] [\-b <branch>]\fR" 4
301+
.IX Item "git subrepo fetch <subdir>|--force --all [-r <remote>] [-b <branch>]"
302302
Fetch the remote/upstream content for a subrepo.
303303
.Sp
304304
It will create a Git reference called \f(CW\*(C`subrepo/<subdir>/fetch\*(C'\fR that
305305
points at the same commit as \f(CW\*(C`FETCH_HEAD\*(C'\fR. It will also create a remote
306306
called \f(CW\*(C`subrepo/<subdir>\*(C'\fR. These are temporary and you can easily remove
307307
them with the subrepo \f(CW\*(C`clean\*(C'\fR command.
308308
.Sp
309-
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.
309+
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.
310310
.ie n .IP """git subrepo branch <subdir>|\-\-all [\-f] [\-F]""" 4
311311
.el .IP "\f(CWgit subrepo branch <subdir>|\-\-all [\-f] [\-F]\fR" 4
312312
.IX Item "git subrepo branch <subdir>|--all [-f] [-F]"

0 commit comments

Comments
 (0)