eac_git 0.18.0 → 0.18.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/eac_git/local/changed_file.rb +6 -0
- data/lib/eac_git/local/remote.rb +0 -2
- data/lib/eac_git/local/subrepo/config.rb +2 -0
- data/lib/eac_git/local.rb +1 -1
- data/lib/eac_git/remote_like/ls_result.rb +1 -1
- data/lib/eac_git/remote_like.rb +0 -1
- data/lib/eac_git/rspec/stubbed_git_local_repo.rb +0 -2
- data/lib/eac_git/rspec.rb +0 -1
- data/lib/eac_git/version.rb +1 -1
- data/lib/eac_git.rb +0 -2
- data/vendor/git-subrepo/.fish.rc +20 -0
- data/vendor/git-subrepo/.gitattributes +1 -0
- data/vendor/git-subrepo/.github/workflows/test.yml +29 -0
- data/vendor/git-subrepo/.gitignore +1 -0
- data/vendor/git-subrepo/.gitrepo +7 -0
- data/vendor/git-subrepo/.rc +32 -0
- data/vendor/git-subrepo/Changes +66 -0
- data/vendor/git-subrepo/Intro.pod +2 -5
- data/vendor/git-subrepo/Makefile +45 -5
- data/vendor/git-subrepo/Meta +2 -2
- data/vendor/git-subrepo/ReadMe.pod +26 -31
- data/vendor/git-subrepo/doc/git-subrepo.swim +22 -18
- data/vendor/git-subrepo/doc/intro-to-subrepo.swim +2 -4
- data/vendor/git-subrepo/ext/bashplus/.gitrepo +12 -0
- data/vendor/git-subrepo/ext/bashplus/.travis.yml +6 -0
- data/vendor/git-subrepo/ext/bashplus/Changes +19 -0
- data/vendor/git-subrepo/ext/bashplus/License +1 -1
- data/vendor/git-subrepo/ext/bashplus/Makefile +25 -0
- data/vendor/git-subrepo/ext/bashplus/Meta +4 -4
- data/vendor/git-subrepo/ext/bashplus/ReadMe.pod +2 -2
- data/vendor/git-subrepo/ext/bashplus/bin/bash+ +8 -7
- data/vendor/git-subrepo/ext/bashplus/doc/bash+.swim +1 -1
- data/vendor/git-subrepo/ext/bashplus/lib/bash+.bash +85 -38
- data/vendor/git-subrepo/ext/bashplus/man/man1/bash+.1 +8 -8
- data/vendor/git-subrepo/ext/bashplus/man/man3/bash+.3 +8 -8
- data/vendor/git-subrepo/ext/bashplus/test/base.t +4 -5
- data/vendor/git-subrepo/ext/bashplus/test/die.t +16 -0
- data/vendor/git-subrepo/ext/bashplus/test/fcopy.t +2 -3
- data/vendor/git-subrepo/ext/bashplus/test/{test.bash → setup} +18 -8
- data/vendor/git-subrepo/ext/bashplus/test/shellcheck.t +37 -0
- data/vendor/git-subrepo/ext/bashplus/test/source-bash+-std.t +10 -11
- data/vendor/git-subrepo/ext/bashplus/test/source-bash+.t +10 -11
- data/vendor/git-subrepo/ext/bashplus/test/use.t +8 -5
- data/vendor/git-subrepo/ext/bashplus/test/version-check.t +23 -0
- data/vendor/git-subrepo/ext/test-more-bash/.gitrepo +12 -0
- data/vendor/git-subrepo/ext/test-more-bash/.travis.yml +6 -0
- data/vendor/git-subrepo/ext/test-more-bash/Changes +11 -0
- data/vendor/git-subrepo/ext/test-more-bash/License +1 -1
- data/vendor/git-subrepo/ext/test-more-bash/Makefile +25 -0
- data/vendor/git-subrepo/ext/test-more-bash/Meta +5 -5
- data/vendor/git-subrepo/ext/test-more-bash/ReadMe.pod +9 -3
- data/vendor/git-subrepo/ext/test-more-bash/doc/test-more.swim +7 -2
- data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/.gitrepo +12 -0
- data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/.travis.yml +6 -0
- data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/Changes +11 -0
- data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/License +1 -1
- data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/Makefile +25 -0
- data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/Meta +3 -3
- data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/ReadMe.pod +2 -2
- data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/bin/bash+ +8 -7
- data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/doc/bash+.swim +1 -1
- data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/lib/bash+.bash +85 -38
- data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/man/man1/bash+.1 +8 -8
- data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/man/man3/bash+.3 +8 -8
- data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/base.t +4 -4
- data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/die.t +17 -0
- data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/fcopy.t +2 -2
- data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/{test.bash → setup} +17 -8
- data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/shellcheck.t +38 -0
- data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/source-bash+-std.t +10 -10
- data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/source-bash+.t +10 -10
- data/vendor/git-subrepo/ext/test-more-bash/ext/bashplus/test/use.t +8 -4
- data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/.gitrepo +12 -0
- data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/.travis.yml +5 -0
- data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/Changes +11 -0
- data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/License +1 -1
- data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/Makefile +30 -0
- data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/Meta +3 -3
- data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/ReadMe.pod +2 -2
- data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/doc/test-tap.swim +1 -1
- data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/lib/test/tap.bash +46 -42
- data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/man/man3/test-tap.3 +8 -8
- data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/bail_out.t +1 -1
- data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/fail.t +1 -1
- data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/fail_fast.t +1 -1
- data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/helper.bash +1 -1
- data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/shellcheck.t +42 -0
- data/vendor/git-subrepo/ext/test-more-bash/ext/test-tap-bash/test/tap.t +11 -5
- data/vendor/git-subrepo/ext/test-more-bash/lib/test/more.bash +35 -15
- data/vendor/git-subrepo/ext/test-more-bash/man/man3/test-more.3 +16 -10
- data/vendor/git-subrepo/ext/test-more-bash/test/fail.t +15 -1
- data/vendor/git-subrepo/ext/test-more-bash/test/more.t +12 -4
- data/vendor/git-subrepo/ext/test-more-bash/test/setup +3 -3
- data/vendor/git-subrepo/ext/test-more-bash/test/shellcheck.t +35 -0
- data/vendor/git-subrepo/ext/test-more-bash/test/test/fail1.t +14 -1
- data/vendor/git-subrepo/lib/git-subrepo +375 -260
- data/vendor/git-subrepo/lib/git-subrepo.d/help-functions.bash +21 -22
- data/vendor/git-subrepo/man/man1/git-subrepo.1 +125 -141
- data/vendor/git-subrepo/pkg/bin/generate-completion.pl +0 -7
- data/vendor/git-subrepo/pkg/bin/generate-help-functions.pl +0 -2
- data/vendor/git-subrepo/share/completion.bash +1 -3
- data/vendor/git-subrepo/share/enable-completion.sh +3 -3
- data/vendor/git-subrepo/share/zsh-completion/_git-subrepo +2 -7
- data/vendor/git-subrepo/test/Dockerfile +112 -0
- data/vendor/git-subrepo/test/branch-all.t +6 -6
- data/vendor/git-subrepo/test/branch-rev-list-one-path.t +7 -8
- data/vendor/git-subrepo/test/branch-rev-list.t +7 -8
- data/vendor/git-subrepo/test/branch.t +9 -9
- data/vendor/git-subrepo/test/clean.t +3 -3
- data/vendor/git-subrepo/test/clone-annotated-tag.t +7 -7
- data/vendor/git-subrepo/test/clone.t +20 -25
- data/vendor/git-subrepo/test/config.t +7 -6
- data/vendor/git-subrepo/test/encode.t +17 -17
- data/vendor/git-subrepo/test/error.t +18 -18
- data/vendor/git-subrepo/test/fetch.t +4 -4
- data/vendor/git-subrepo/test/gitignore.t +8 -8
- data/vendor/git-subrepo/test/init.t +6 -7
- data/vendor/git-subrepo/test/issue29.t +3 -3
- data/vendor/git-subrepo/test/issue95.t +2 -2
- data/vendor/git-subrepo/test/issue96.t +3 -3
- data/vendor/git-subrepo/test/pull-all.t +5 -5
- data/vendor/git-subrepo/test/pull-merge.t +16 -15
- data/vendor/git-subrepo/test/pull-message.t +12 -12
- data/vendor/git-subrepo/test/pull-new-branch.t +8 -7
- data/vendor/git-subrepo/test/pull-ours.t +10 -10
- data/vendor/git-subrepo/test/pull-theirs.t +8 -8
- data/vendor/git-subrepo/test/pull-twice.t +4 -4
- data/vendor/git-subrepo/test/pull-worktree.t +5 -5
- data/vendor/git-subrepo/test/pull.t +14 -14
- data/vendor/git-subrepo/test/push-after-init.t +7 -6
- data/vendor/git-subrepo/test/push-after-push-no-changes.t +27 -0
- data/vendor/git-subrepo/test/push-force.t +7 -6
- data/vendor/git-subrepo/test/push-new-branch.t +10 -10
- data/vendor/git-subrepo/test/push-no-changes.t +3 -3
- data/vendor/git-subrepo/test/push-squash.t +7 -7
- data/vendor/git-subrepo/test/push.t +35 -34
- data/vendor/git-subrepo/test/rebase.t +63 -0
- data/vendor/git-subrepo/test/reclone.t +15 -8
- data/vendor/git-subrepo/test/setup +62 -55
- data/vendor/git-subrepo/test/shellcheck.t +37 -0
- data/vendor/git-subrepo/test/status.t +47 -27
- data/vendor/git-subrepo/test/submodule.t +4 -4
- data/vendor/git-subrepo/test/zsh.t +27 -0
- metadata +45 -13
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
#!/usr/bin/env bash
|
|
2
|
-
|
|
3
1
|
# DO NOT EDIT. This file generated by pkg/bin/generate-help-functions.pl.
|
|
4
2
|
|
|
5
3
|
set -e
|
|
@@ -8,14 +6,14 @@ help:all() {
|
|
|
8
6
|
cat <<'...'
|
|
9
7
|
branch branch <subdir>|--all [-f] [-F]
|
|
10
8
|
clean clean <subdir>|--all|--ALL [-f]
|
|
11
|
-
clone clone <repository> [<subdir>] [-b <branch>] [-f] [-m <msg>] [-e] [--method <merge|rebase>]
|
|
12
|
-
commit commit <subdir> [<subrepo-ref>] [-m <msg>] [-e] [-f] [-F]
|
|
9
|
+
clone clone <repository> [<subdir>] [-b <branch>] [-f] [-m <msg>] [--file=<msg file>] [-e] [--method <merge|rebase>]
|
|
10
|
+
commit commit <subdir> [<subrepo-ref>] [-m <msg>] [--file=<msg file>] [-e] [-f] [-F]
|
|
13
11
|
config config <subdir> <option> [<value>] [-f]
|
|
14
|
-
fetch fetch <subdir>|--all [-r <remote>] [-b <branch>]
|
|
12
|
+
fetch fetch <subdir>|--force --all [-r <remote>] [-b <branch>]
|
|
15
13
|
help help [<command>|--all]
|
|
16
14
|
init init <subdir> [-r <remote>] [-b <branch>] [--method <merge|rebase>]
|
|
17
|
-
pull pull <subdir>|--all [-M|-R|-f] [-m <msg>] [-e] [-b <branch>] [-r <remote>] [-u]
|
|
18
|
-
push push <subdir>|--all [<branch>] [-r <remote>] [-b <branch>] [-M|-R] [-u] [-f] [-s] [-N]
|
|
15
|
+
pull pull <subdir>|--all [-M|-R|-f] [-m <msg>] [--file=<msg file>] [-e] [-b <branch>] [-r <remote>] [-u]
|
|
16
|
+
push push <subdir>|--all [<branch>] [-m msg] [--file=<msg file>] [-r <remote>] [-b <branch>] [-M|-R] [-u] [-f] [-s] [-N]
|
|
19
17
|
status status [<subdir>|--all|--ALL] [-F] [-q|-v]
|
|
20
18
|
upgrade upgrade
|
|
21
19
|
version version [-q|-v]
|
|
@@ -71,7 +69,7 @@ help:clean() {
|
|
|
71
69
|
help:clone() {
|
|
72
70
|
cat <<'...'
|
|
73
71
|
|
|
74
|
-
Usage: git subrepo clone <repository> [<subdir>] [-b <branch>] [-f] [-m <msg>] [-e] [--method <merge|rebase>]
|
|
72
|
+
Usage: git subrepo clone <repository> [<subdir>] [-b <branch>] [-f] [-m <msg>] [--file=<msg file>] [-e] [--method <merge|rebase>]
|
|
75
73
|
|
|
76
74
|
|
|
77
75
|
Add a repository as a subrepo in a subdir of your repository.
|
|
@@ -94,15 +92,15 @@ help:clone() {
|
|
|
94
92
|
The `--method` option will decide how the join process between branches are
|
|
95
93
|
performed. The default option is merge.
|
|
96
94
|
|
|
97
|
-
The `clone` command accepts the `--branch=` `--edit`, `--force`
|
|
98
|
-
`--message=` options.
|
|
95
|
+
The `clone` command accepts the `--branch=` `--edit`, `--file`, `--force`
|
|
96
|
+
and `--message=` options.
|
|
99
97
|
...
|
|
100
98
|
}
|
|
101
99
|
|
|
102
100
|
help:commit() {
|
|
103
101
|
cat <<'...'
|
|
104
102
|
|
|
105
|
-
Usage: git subrepo commit <subdir> [<subrepo-ref>] [-m <msg>] [-e] [-f] [-F]
|
|
103
|
+
Usage: git subrepo commit <subdir> [<subrepo-ref>] [-m <msg>] [--file=<msg file>] [-e] [-f] [-F]
|
|
106
104
|
|
|
107
105
|
|
|
108
106
|
Add subrepo branch to current history as a single commit.
|
|
@@ -116,8 +114,8 @@ help:commit() {
|
|
|
116
114
|
branch history. That way the same branch can push upstream. Use the
|
|
117
115
|
`--force` option to commit anyway.
|
|
118
116
|
|
|
119
|
-
The `commit` command accepts the `--edit`, `--fetch`, `--force`
|
|
120
|
-
`--message=` options.
|
|
117
|
+
The `commit` command accepts the `--edit`, `--fetch`, `--file`, `--force`
|
|
118
|
+
and `--message=` options.
|
|
121
119
|
...
|
|
122
120
|
}
|
|
123
121
|
|
|
@@ -142,7 +140,7 @@ help:config() {
|
|
|
142
140
|
help:fetch() {
|
|
143
141
|
cat <<'...'
|
|
144
142
|
|
|
145
|
-
Usage: git subrepo fetch <subdir>|--all [-r <remote>] [-b <branch>]
|
|
143
|
+
Usage: git subrepo fetch <subdir>|--force --all [-r <remote>] [-b <branch>]
|
|
146
144
|
|
|
147
145
|
|
|
148
146
|
Fetch the remote/upstream content for a subrepo.
|
|
@@ -152,7 +150,7 @@ help:fetch() {
|
|
|
152
150
|
`subrepo/<subdir>`. These are temporary and you can easily remove them with
|
|
153
151
|
the subrepo `clean` command.
|
|
154
152
|
|
|
155
|
-
The `fetch` command accepts the `--all`, `--branch=` and `--remote=` options.
|
|
153
|
+
The `fetch` command accepts the `--force`, `--all`, `--branch=` and `--remote=` options.
|
|
156
154
|
...
|
|
157
155
|
}
|
|
158
156
|
|
|
@@ -189,7 +187,7 @@ help:init() {
|
|
|
189
187
|
If you specify the `--remote` (and optionally the `--branch`) option, the
|
|
190
188
|
values will be added to the `<subdir>/.gitrepo` file. The `--remote` option
|
|
191
189
|
is the upstream URL, and the `--branch` option is the upstream branch to push
|
|
192
|
-
to. These values will be needed to do a `git subrepo push` command,
|
|
190
|
+
to. These values will be needed to do a `git subrepo push` command, but they
|
|
193
191
|
can be provided later on the `push` command (and saved to `<subdir>/.gitrepo`
|
|
194
192
|
if you also specify the `--update` option).
|
|
195
193
|
|
|
@@ -206,7 +204,7 @@ help:init() {
|
|
|
206
204
|
help:pull() {
|
|
207
205
|
cat <<'...'
|
|
208
206
|
|
|
209
|
-
Usage: git subrepo pull <subdir>|--all [-M|-R|-f] [-m <msg>] [-e] [-b <branch>] [-r <remote>] [-u]
|
|
207
|
+
Usage: git subrepo pull <subdir>|--all [-M|-R|-f] [-m <msg>] [--file=<msg file>] [-e] [-b <branch>] [-r <remote>] [-u]
|
|
210
208
|
|
|
211
209
|
|
|
212
210
|
Update the subrepo subdir with the latest upstream changes.
|
|
@@ -252,15 +250,15 @@ help:pull() {
|
|
|
252
250
|
|
|
253
251
|
The set of commands used above are described in detail below.
|
|
254
252
|
|
|
255
|
-
The `pull` command accepts the `--all`, `--branch=`, `--edit`, `--
|
|
256
|
-
`--message=`, `--remote=` and `--update` options.
|
|
253
|
+
The `pull` command accepts the `--all`, `--branch=`, `--edit`, `--file`,
|
|
254
|
+
`--force`, `--message=`, `--remote=` and `--update` options.
|
|
257
255
|
...
|
|
258
256
|
}
|
|
259
257
|
|
|
260
258
|
help:push() {
|
|
261
259
|
cat <<'...'
|
|
262
260
|
|
|
263
|
-
Usage: git subrepo push <subdir>|--all [<branch>] [-r <remote>] [-b <branch>] [-M|-R] [-u] [-f] [-s] [-N]
|
|
261
|
+
Usage: git subrepo push <subdir>|--all [<branch>] [-m msg] [--file=<msg file>] [-r <remote>] [-b <branch>] [-M|-R] [-u] [-f] [-s] [-N]
|
|
264
262
|
|
|
265
263
|
|
|
266
264
|
Push a properly merged subrepo branch back upstream.
|
|
@@ -285,8 +283,9 @@ help:push() {
|
|
|
285
283
|
discouraged. Only use this option if you fully understand it. (The `--force`
|
|
286
284
|
option will NOT check for a proper merge. ANY branch will be force pushed!)
|
|
287
285
|
|
|
288
|
-
The `push` command accepts the `--all`, `--branch=`, `--dry-run`, `--
|
|
289
|
-
`--merge`, `--rebase`, `--remote=`, `--squash` and
|
|
286
|
+
The `push` command accepts the `--all`, `--branch=`, `--dry-run`, `--file`,
|
|
287
|
+
`--force`, `--merge`, `--message`, `--rebase`, `--remote=`, `--squash` and
|
|
288
|
+
`--update` options.
|
|
290
289
|
...
|
|
291
290
|
}
|
|
292
291
|
|