avm-tools 0.53.0 → 0.54.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/avm/git/issue/complete/_git_subrepos.rb +20 -0
- data/lib/avm/git/issue/complete/_validations.rb +1 -0
- data/lib/avm/git/issue/complete/_working_tree.rb +5 -2
- data/lib/avm/tools/runner/git/subrepo/check.rb +5 -1
- data/lib/avm/tools/version.rb +1 -1
- data/lib/eac_launcher.rb +0 -3
- data/lib/eac_launcher/git/base/underlying.rb +11 -9
- data/vendor/gems/eac_git/eac_git.gemspec +1 -1
- data/vendor/gems/eac_git/lib/eac_git/executables.rb +24 -4
- data/vendor/gems/eac_git/lib/eac_git/rspec.rb +17 -0
- data/vendor/gems/eac_git/lib/eac_git/version.rb +1 -1
- data/vendor/gems/eac_git/spec/lib/eac_git/executables_spec.rb +13 -0
- data/vendor/gems/eac_git/spec/spec_helper.rb +3 -0
- data/vendor/gems/eac_git/vendor/git-subrepo/Changes +110 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/Intro.pod +7 -6
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/License +1 -1
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/Makefile +9 -7
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/Meta +4 -4
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ReadMe.pod +15 -12
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/doc/comparison.swim +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/doc/git-subrepo.swim +6 -9
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/doc/intro-to-subrepo.swim +4 -4
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/bashplus/Changes +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/bashplus/License +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/bashplus/Makefile +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/bashplus/Meta +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/bashplus/ReadMe.pod +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/bashplus/bin/bash+ +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/bashplus/doc/bash+.swim +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/bashplus/lib/bash+.bash +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/bashplus/man/man1/bash+.1 +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/bashplus/man/man3/bash+.3 +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/bashplus/test/base.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/bashplus/test/fcopy.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/bashplus/test/lib/foo/bar.bash +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/bashplus/test/lib/foo/foo.bash +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/bashplus/test/source-bash+-std.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/bashplus/test/source-bash+.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/bashplus/test/test.bash +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/bashplus/test/use.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/Changes +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/License +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/Makefile +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/Meta +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ReadMe.pod +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/doc/test-more.swim +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/bashplus/Changes +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/bashplus/License +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/bashplus/Makefile +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/bashplus/Meta +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/bashplus/ReadMe.pod +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/bashplus/bin/bash+ +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/bashplus/doc/bash+.swim +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/bashplus/lib/bash+.bash +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/bashplus/man/man1/bash+.1 +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/bashplus/man/man3/bash+.3 +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/bashplus/test/base.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/bashplus/test/fcopy.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/bashplus/test/lib/foo/bar.bash +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/bashplus/test/lib/foo/foo.bash +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/bashplus/test/source-bash+-std.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/bashplus/test/source-bash+.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/bashplus/test/test.bash +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/bashplus/test/use.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/test-tap-bash/Changes +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/test-tap-bash/License +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/test-tap-bash/Makefile +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/test-tap-bash/Meta +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/test-tap-bash/ReadMe.pod +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/test-tap-bash/doc/test-tap.swim +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/test-tap-bash/lib/test/tap.bash +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/test-tap-bash/man/man3/test-tap.3 +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/test-tap-bash/test/bail_out.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/test-tap-bash/test/done.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/test-tap-bash/test/fail.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/test-tap-bash/test/fail_fast.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/test-tap-bash/test/helper.bash +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/test-tap-bash/test/pass.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/test-tap-bash/test/plan.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/test-tap-bash/test/skip_all.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/test-tap-bash/test/tap.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/test-tap-bash/test/test/bail.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/test-tap-bash/test/test/fail.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/test-tap-bash/test/test/fail_fast.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/test-tap-bash/test/test/skip-all-init.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/test-tap-bash/test/test/skip-all-plan.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/lib/test/more.bash +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/man/man3/test-more.3 +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/test/fail.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/test/more.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/test/pass.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/test/setup +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/test/skip_all.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/test/test/fail1.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/test/test/skip_all.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/lib/git-subrepo +30 -20
- data/vendor/gems/eac_git/vendor/git-subrepo/lib/git-subrepo.d/bash+.bash +1 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/lib/git-subrepo.d/help-functions.bash +1 -5
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/man/man1/git-subrepo.1 +18 -21
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/note/0.4.0 +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/note/AllGitCmds +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/note/Cases +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/note/Commands +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/note/Dags +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/note/Gists +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/note/Links +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/note/Plugins +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/note/Spec +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/note/Story1 +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/note/ToDo +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/note/design.swim +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/note/design2.swim +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/note/init-test +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/note/pull-dance.txt +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/note/recreate-rebase-conflict.sh +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/note/subtree-rebase-fail-example/test.bash +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/note/test-subrepo-push.sh +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/note/test.sh +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/pkg/bin/generate-completion.pl +1 -1
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/pkg/bin/generate-help-functions.pl +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/share/completion.bash +3 -3
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/share/enable-completion.sh +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/share/git-completion.bash +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/share/zsh-completion/_git-subrepo +3 -4
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/branch-all.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/branch-rev-list-one-path.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/branch-rev-list.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/branch.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/clean.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/clone-annotated-tag.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/clone.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/compile.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/config.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/encode.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/error.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/fetch.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/gitignore.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/init.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/issue29.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/issue95.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/issue96.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/pull-all.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/pull-merge.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/pull-message.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/pull-new-branch.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/pull-ours.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/pull-theirs.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/pull-twice.t +0 -0
- data/vendor/gems/eac_git/vendor/git-subrepo/test/pull-worktree.t +40 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/pull.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/push-after-init.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/push-force.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/push-new-branch.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/push-no-changes.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/push-squash.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/push.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/reclone.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/bar/HEAD +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/bar/config +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/bar/objects/1f/0c4b264caed0126814a0ede851a1e0b4e16ae6 +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/bar/objects/87/46903fdb1b9c2101377880125917c2e05b4d69 +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/bar/objects/94/c86ffc745232d89f78c6f895e11e71272518db +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/bar/objects/c6/76c57b6576743fa56278527aa60ebd2e202a7c +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/bar/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/bar/objects/f6/2a8ff3feadf39b0a98f1a86ec6d1eb33858ee9 +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/bar/refs/heads/master +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/bar/refs/tags/A +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/foo/HEAD +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/foo/config +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/foo/objects/a0/f4cdaaf533a936296cdebbed8206c3b9ededa8 +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/foo/objects/e2/1291a1ad392a9d4c51dd9586804f1467b28afd +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/foo/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/foo/refs/heads/master +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/init/HEAD +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/init/config +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/init/objects/11/523f5dcf03b4c89b592dc8a3d0308f68da2386 +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/init/objects/14/2addf8ec5f37334e837440122c62f2c68a29ad +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/init/objects/32/5180321750a21cd7a4e7ecda319e557a4f6a09 +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/init/objects/3d/918c6901c02f43af5d31779dd5e1f9166aeb36 +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/init/objects/3e/4cb596066dce63ba4d047abddb677389b65e19 +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/init/objects/4b/6e53022e7a04f07887697e4f3d7c377fd9822b +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/init/objects/58/931fc1bd559b59c41ea738fc7ad04f9ad01bd3 +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/init/objects/5e/c0c28e1b806f25efdca18fcf7a74b49c3755bd +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/init/objects/75/fa6584e748f57eff06eebdc55e9ac21d4fcbf2 +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/init/objects/80/2d5edbd5e1cb7fca82b5bd38e7c8a0a496fb20 +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/init/objects/94/7b3d714c38791e95ad6f928b48c98bb8708acd +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/init/objects/95/e1f2df3f4d5f3d7a60588c25a7ca8a913d3c2a +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/init/objects/b1/5f4a7666baf40d949548ead946a3370e273479 +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/init/objects/c3/ee8978c4c5d84c3b7d00ba8e5906933d027882 +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/init/objects/c8/b0bffbc405ef3fad7354ff833fbec36d67ddfa +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/init/objects/dd/8bdb934ec848137f011fe423b185505c343626 +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/init/objects/e2/9be58c767cfeb27235c995d293a7d71aac0135 +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/init/objects/ee/1224401fc6aac595145fa727dcf6706ac8aec1 +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/init/objects/f1/cc1a657b2e805c400f5dcaaa76bd29c6178b1b +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/repo/init/refs/heads/master +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/setup +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/status.t +0 -0
- data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/test/submodule.t +0 -0
- data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/command.rb +1 -0
- data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/envs/command/extra_options.rb +8 -0
- data/vendor/gems/eac_ruby_utils/lib/eac_ruby_utils/version.rb +1 -1
- metadata +194 -189
- data/vendor/git-subrepo/Changes +0 -51
@@ -1,7 +1,7 @@
|
|
1
1
|
=pod
|
2
2
|
|
3
3
|
=for comment
|
4
|
-
DO NOT EDIT. This Pod was generated by Swim v0.1.
|
4
|
+
DO NOT EDIT. This Pod was generated by Swim v0.1.48.
|
5
5
|
See http://github.com/ingydotnet/swim-pm#readme
|
6
6
|
|
7
7
|
=encoding utf8
|
@@ -10,7 +10,8 @@ See http://github.com/ingydotnet/swim-pm#readme
|
|
10
10
|
|
11
11
|
git-subrepo - Git Submodule Alternative
|
12
12
|
|
13
|
-
|
13
|
+
=for html
|
14
|
+
<a href="https://travis-ci.org/ingydotnet/git-subrepo"><img src="https://travis-ci.org/ingydotnet/git-subrepo.png" alt="git-subrepo"></a>
|
14
15
|
|
15
16
|
=head1 Synopsis
|
16
17
|
|
@@ -116,7 +117,7 @@ The best short answer is:
|
|
116
117
|
|
117
118
|
The complete "Installation Instructions" can be found below.
|
118
119
|
|
119
|
-
Note: git-subrepo needs a git version (> 2.
|
120
|
+
Note: git-subrepo needs a git version (> 2.7) that supports worktree:s.
|
120
121
|
|
121
122
|
=head1 Commands
|
122
123
|
|
@@ -217,10 +218,6 @@ When you pull you can assume a fast-forward strategy (default) or you can
|
|
217
218
|
specify a C<--rebase>, C<--merge> or C<--force> strategy. The latter is the
|
218
219
|
same as a C<clone --force> operation, using the current remote and branch.
|
219
220
|
|
220
|
-
When you pull you can assume a fast-forward strategy (default) or you can
|
221
|
-
specify a C<--rebase>, C<--merge> or C<--force> strategy. The latter is the
|
222
|
-
same as a C<clone --force> operation, using the current remote and branch.
|
223
|
-
|
224
221
|
Like the C<clone> command, C<pull> will squash all the changes (since the last
|
225
222
|
pull or clone) into one commit. This keeps your mainline history nice and
|
226
223
|
clean. You can easily see the subrepo's history with the C<git log> command:
|
@@ -353,8 +350,8 @@ Example to update the C
|
|
353
350
|
Same as C<git help subrepo>. Will launch the manpage. For the shorter usage,
|
354
351
|
use C<git subrepo -h>.
|
355
352
|
|
356
|
-
Use C<< git subrepo help <command> to get help for a specific command. Use
|
357
|
-
all
|
353
|
+
Use C<< git subrepo help <command> >> to get help for a specific command. Use
|
354
|
+
C<--all> to get a summary of all commands.
|
358
355
|
|
359
356
|
The C<help> command accepts the C<--all> option.
|
360
357
|
|
@@ -682,14 +679,20 @@ C
|
|
682
679
|
|
683
680
|
=back
|
684
681
|
|
685
|
-
=head1
|
682
|
+
=head1 Authors
|
686
683
|
|
687
|
-
|
684
|
+
=over
|
685
|
+
|
686
|
+
=item * Ingy döt Net <ingy@ingy.net>
|
687
|
+
|
688
|
+
=item * Magnus Carlsson <grimmymail@gmail.com>
|
689
|
+
|
690
|
+
=back
|
688
691
|
|
689
692
|
=head1 License and Copyright
|
690
693
|
|
691
694
|
The MIT License (MIT)
|
692
695
|
|
693
|
-
Copyright (c) 2013-
|
696
|
+
Copyright (c) 2013-2020 Ingy döt Net
|
694
697
|
|
695
698
|
=cut
|
File without changes
|
@@ -78,7 +78,7 @@ The best short answer is:
|
|
78
78
|
|
79
79
|
The complete "Installation Instructions" can be found below.
|
80
80
|
|
81
|
-
Note: git-subrepo needs a git version (> 2.
|
81
|
+
Note: git-subrepo needs a git version (> 2.7) that supports worktree:s.
|
82
82
|
|
83
83
|
= Commands
|
84
84
|
|
@@ -177,10 +177,6 @@ the same arguments. Keep reading…
|
|
177
177
|
specify a `--rebase`, `--merge` or `--force` strategy. The latter is the same
|
178
178
|
as a `clone --force` operation, using the current remote and branch.
|
179
179
|
|
180
|
-
When you pull you can assume a fast-forward strategy (default) or you can
|
181
|
-
specify a `--rebase`, `--merge` or `--force` strategy. The latter is the same
|
182
|
-
as a `clone --force` operation, using the current remote and branch.
|
183
|
-
|
184
180
|
Like the `clone` command, `pull` will squash all the changes (since the last
|
185
181
|
pull or clone) into one commit. This keeps your mainline history nice and
|
186
182
|
clean. You can easily see the subrepo's history with the `git log` command:
|
@@ -310,7 +306,7 @@ the same arguments. Keep reading…
|
|
310
306
|
Same as `git help subrepo`. Will launch the manpage. For the shorter usage,
|
311
307
|
use `git subrepo -h`.
|
312
308
|
|
313
|
-
Use `git subrepo help <command
|
309
|
+
Use `git subrepo help <command>` to get help for a specific command. Use
|
314
310
|
`--all` to get a summary of all commands.
|
315
311
|
|
316
312
|
The `help` command accepts the `--all` option.
|
@@ -600,12 +596,13 @@ If you want to chat about the `git-subrepo` command, join `#gitcommands` on
|
|
600
596
|
* Written in (very modern) Bash, with full test suite. Take a look.
|
601
597
|
* A `.gitrepo` file never is in the top level dir (next to a `.git/` dir).
|
602
598
|
|
603
|
-
=
|
599
|
+
= Authors
|
604
600
|
|
605
|
-
|
601
|
+
* Ingy döt Net <ingy@ingy.net>
|
602
|
+
* Magnus Carlsson <grimmymail@gmail.com>
|
606
603
|
|
607
604
|
= License and Copyright
|
608
605
|
|
609
606
|
The MIT License (MIT)
|
610
607
|
|
611
|
-
Copyright (c) 2013-
|
608
|
+
Copyright (c) 2013-2020 Ingy döt Net
|
@@ -320,10 +320,10 @@ The resulting history is:
|
|
320
320
|
|
321
321
|
Compare that to *subtree*. This:
|
322
322
|
|
323
|
-
$ git
|
324
|
-
$ git
|
325
|
-
$ git
|
326
|
-
$ git
|
323
|
+
$ git subtree add abc git@github.com:user/abc master
|
324
|
+
$ git subtree add xyz git@github.com:user/def master
|
325
|
+
$ git subtree pull abc git@github.com:user/abc master
|
326
|
+
$ git subtree pull xyz git@github.com:user/def master
|
327
327
|
|
328
328
|
Produces this:
|
329
329
|
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/bashplus/test/lib/foo/bar.bash
RENAMED
File without changes
|
data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/bashplus/test/lib/foo/foo.bash
RENAMED
File without changes
|
data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/bashplus/test/source-bash+-std.t
RENAMED
File without changes
|
data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/bashplus/test/source-bash+.t
RENAMED
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/doc/test-more.swim
RENAMED
File without changes
|
data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/bashplus/Changes
RENAMED
File without changes
|
data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/bashplus/License
RENAMED
File without changes
|
data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/bashplus/Makefile
RENAMED
File without changes
|
data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/ext/bashplus/Meta
RENAMED
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/lib/test/more.bash
RENAMED
File without changes
|
data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/man/man3/test-more.3
RENAMED
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/test/skip_all.t
RENAMED
File without changes
|
data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/test/test/fail1.t
RENAMED
File without changes
|
data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/ext/test-more-bash/test/test/skip_all.t
RENAMED
File without changes
|
@@ -1,7 +1,7 @@
|
|
1
1
|
#!/usr/bin/env bash
|
2
2
|
#
|
3
3
|
#
|
4
|
-
# Copyright 2013-
|
4
|
+
# Copyright 2013-2020 - Ingy döt Net <ingy@ingy.net>
|
5
5
|
#
|
6
6
|
|
7
7
|
|
@@ -26,9 +26,9 @@ else
|
|
26
26
|
fi
|
27
27
|
bash+:import :std can
|
28
28
|
|
29
|
-
VERSION=0.4.
|
29
|
+
VERSION=0.4.1
|
30
30
|
REQUIRED_GIT_VERSION=2.7.0
|
31
|
-
GIT_TMP
|
31
|
+
GIT_TMP="$(git rev-parse --git-common-dir 2> /dev/null || echo .git)/tmp"
|
32
32
|
|
33
33
|
# `git rev-parse` turns this into a getopt parser and a command usage message:
|
34
34
|
GETOPT_SPEC="\
|
@@ -405,8 +405,8 @@ command:help() {
|
|
405
405
|
command:version() {
|
406
406
|
cat <<...
|
407
407
|
git-subrepo Version: $VERSION
|
408
|
-
Copyright 2013-
|
409
|
-
https://github.com/
|
408
|
+
Copyright 2013-2020 Ingy döt Net
|
409
|
+
https://github.com/ingydotnet/git-subrepo
|
410
410
|
$BASH_SOURCE
|
411
411
|
Git Version: $git_version
|
412
412
|
|
@@ -581,8 +581,9 @@ subrepo:push() {
|
|
581
581
|
if ! OK; then
|
582
582
|
# Check if we are pushing to a new upstream repo (or branch) and just
|
583
583
|
# push the commit directly. This is common after a `git subrepo init`:
|
584
|
-
|
585
|
-
|
584
|
+
# Force to case in
|
585
|
+
local re="(^|"$'\n'")fatal: couldn't find remote ref "
|
586
|
+
if [[ ${output,,} =~ $re ]]; then
|
586
587
|
o "Pushing to new upstream: $subrepo_remote ($subrepo_branch)."
|
587
588
|
new_upstream=true
|
588
589
|
else
|
@@ -704,7 +705,7 @@ subrepo:branch() {
|
|
704
705
|
local prev_commit=
|
705
706
|
local ancestor=
|
706
707
|
o "Create new commits with parents into the subrepo fetch"
|
707
|
-
OUT=true RUN git rev-list --reverse --ancestry-path "$subrepo_parent..HEAD"
|
708
|
+
OUT=true RUN git rev-list --reverse --ancestry-path --topo-order "$subrepo_parent..HEAD"
|
708
709
|
local commit_list="$output"
|
709
710
|
for commit in $commit_list; do
|
710
711
|
o "Working on $commit"
|
@@ -737,7 +738,7 @@ subrepo:branch() {
|
|
737
738
|
o "Check for rebase"
|
738
739
|
if git:rev-exists "$refs_subrepo_fetch"; then
|
739
740
|
if ! git:commit-in-rev-list "$gitrepo_commit" "$refs_subrepo_fetch"; then
|
740
|
-
error "Local repository does not contain $gitrepo_commit. Try to 'git subrepo fetch $subref'
|
741
|
+
error "Local repository does not contain $gitrepo_commit. Try to 'git subrepo fetch $subref' or add the '-F' flag to always fetch the latest content."
|
741
742
|
fi
|
742
743
|
fi
|
743
744
|
|
@@ -966,11 +967,15 @@ subrepo:clean() {
|
|
966
967
|
|
967
968
|
if "$force_wanted"; then
|
968
969
|
o "Remove all subrepo refs."
|
969
|
-
|
970
|
-
|
971
|
-
|
972
|
-
RUN rm -fr .git/refs/subrepo/$subref/
|
970
|
+
local suffix=""
|
971
|
+
if ! $all_wanted; then
|
972
|
+
suffix="$subref/"
|
973
973
|
fi
|
974
|
+
git show-ref | while read hash ref; do
|
975
|
+
if [[ "$ref" == refs/subrepo/$suffix* ]]; then
|
976
|
+
git update-ref -d "$ref"
|
977
|
+
fi
|
978
|
+
done
|
974
979
|
fi
|
975
980
|
}
|
976
981
|
|
@@ -1416,6 +1421,17 @@ assert-environment-ok() {
|
|
1416
1421
|
error "Requires git version $REQUIRED_GIT_VERSION or higher; "`
|
1417
1422
|
`"you have '$git_version'."
|
1418
1423
|
fi
|
1424
|
+
|
1425
|
+
if [[ ${BASH_VERSINFO[0]} -lt 4 ]] ; then
|
1426
|
+
echo "The git-subrepo command requires that 'Bash 4+' is installed."
|
1427
|
+
echo "It doesn't need to be your shell, but it must be in your PATH."
|
1428
|
+
if [[ $OSTYPE == darwin* ]]; then
|
1429
|
+
echo "You appear to be on macOS."
|
1430
|
+
echo "Try: 'brew install bash'."
|
1431
|
+
echo "This will not change your user shell, it just installs 'Bash 5.x'."
|
1432
|
+
fi
|
1433
|
+
exit 1
|
1434
|
+
fi
|
1419
1435
|
}
|
1420
1436
|
|
1421
1437
|
# Make sure git repo is ready:
|
@@ -1508,13 +1524,7 @@ assert-subdir-empty() {
|
|
1508
1524
|
# Find all the current subrepos by looking for all the subdirectories that
|
1509
1525
|
# contain a `.gitrepo` file.
|
1510
1526
|
get-all-subrepos() {
|
1511
|
-
local paths=($(
|
1512
|
-
find . -name '.gitrepo' |
|
1513
|
-
grep -v '/.git/' |
|
1514
|
-
grep '/.gitrepo$' |
|
1515
|
-
sed 's/.gitrepo$//' |
|
1516
|
-
sort
|
1517
|
-
))
|
1527
|
+
local paths=($(git ls-files | sed -n 's!/\.gitrepo$!!p' | sort))
|
1518
1528
|
subrepos=()
|
1519
1529
|
local path
|
1520
1530
|
for path in "${paths[@]}"; do
|
@@ -0,0 +1 @@
|
|
1
|
+
vendor/gems/eac_git/vendor/git-subrepo/lib/git-subrepo.d/../../ext/bashplus/lib/bash+.bash
|
data/vendor/{git-subrepo → gems/eac_git/vendor/git-subrepo}/lib/git-subrepo.d/help-functions.bash
RENAMED
@@ -165,7 +165,7 @@ help:help() {
|
|
165
165
|
Same as `git help subrepo`. Will launch the manpage. For the shorter usage,
|
166
166
|
use `git subrepo -h`.
|
167
167
|
|
168
|
-
Use `git subrepo help <command
|
168
|
+
Use `git subrepo help <command>` to get help for a specific command. Use
|
169
169
|
`--all` to get a summary of all commands.
|
170
170
|
|
171
171
|
The `help` command accepts the `--all` option.
|
@@ -244,10 +244,6 @@ help:pull() {
|
|
244
244
|
specify a `--rebase`, `--merge` or `--force` strategy. The latter is the same
|
245
245
|
as a `clone --force` operation, using the current remote and branch.
|
246
246
|
|
247
|
-
When you pull you can assume a fast-forward strategy (default) or you can
|
248
|
-
specify a `--rebase`, `--merge` or `--force` strategy. The latter is the same
|
249
|
-
as a `clone --force` operation, using the current remote and branch.
|
250
|
-
|
251
247
|
Like the `clone` command, `pull` will squash all the changes (since the last
|
252
248
|
pull or clone) into one commit. This keeps your mainline history nice and
|
253
249
|
clean. You can easily see the subrepo's history with the `git log` command:
|
@@ -1,4 +1,4 @@
|
|
1
|
-
.\" Automatically generated by Pod::Man
|
1
|
+
.\" Automatically generated by Pod::Man 4.10 (Pod::Simple 3.35)
|
2
2
|
.\"
|
3
3
|
.\" Standard preamble:
|
4
4
|
.\" ========================================================================
|
@@ -46,7 +46,7 @@
|
|
46
46
|
.ie \n(.g .ds Aq \(aq
|
47
47
|
.el .ds Aq '
|
48
48
|
.\"
|
49
|
-
.\" If the F register is
|
49
|
+
.\" If the F register is >0, we'll generate index entries on stderr for
|
50
50
|
.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
|
51
51
|
.\" entries marked with X<> in POD. Of course, you'll have to process the
|
52
52
|
.\" output yourself in some meaningful fashion.
|
@@ -56,12 +56,12 @@
|
|
56
56
|
..
|
57
57
|
.nr rF 0
|
58
58
|
.if \n(.g .if rF .nr rF 1
|
59
|
-
.if (\n(rF:(\n(.g==0)) \{
|
60
|
-
. if \nF \{
|
59
|
+
.if (\n(rF:(\n(.g==0)) \{\
|
60
|
+
. if \nF \{\
|
61
61
|
. de IX
|
62
62
|
. tm Index:\\$1\t\\n%\t"\\$2"
|
63
63
|
..
|
64
|
-
. if !\nF==2 \{
|
64
|
+
. if !\nF==2 \{\
|
65
65
|
. nr % 0
|
66
66
|
. nr F 2
|
67
67
|
. \}
|
@@ -70,8 +70,8 @@
|
|
70
70
|
.rr rF
|
71
71
|
.\" ========================================================================
|
72
72
|
.\"
|
73
|
-
.IX Title "
|
74
|
-
.TH
|
73
|
+
.IX Title "STDIN 1"
|
74
|
+
.TH STDIN 1 "January 2020" "Generated by Swim v0.1.48" "Git Submodule Alternative"
|
75
75
|
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
|
76
76
|
.\" way too many mistakes in technical documents.
|
77
77
|
.if n .ad l
|
@@ -79,8 +79,6 @@
|
|
79
79
|
.SH "Name"
|
80
80
|
.IX Header "Name"
|
81
81
|
git-subrepo \- Git Submodule Alternative
|
82
|
-
.PP
|
83
|
-
<badge travis ingydotnet/git\-subrepo>
|
84
82
|
.SH "Synopsis"
|
85
83
|
.IX Header "Synopsis"
|
86
84
|
.Vb 1
|
@@ -178,7 +176,7 @@ The best short answer is:
|
|
178
176
|
.PP
|
179
177
|
The complete \*(L"Installation Instructions\*(R" can be found below.
|
180
178
|
.PP
|
181
|
-
Note: git-subrepo needs a git version (> 2.
|
179
|
+
Note: git-subrepo needs a git version (> 2.7) that supports worktree:s.
|
182
180
|
.SH "Commands"
|
183
181
|
.IX Header "Commands"
|
184
182
|
All the \fBsubrepo\fR commands use names of actual Git commands and try to do
|
@@ -276,10 +274,6 @@ When you pull you can assume a fast-forward strategy (default) or you can
|
|
276
274
|
specify a \f(CW\*(C`\-\-rebase\*(C'\fR, \f(CW\*(C`\-\-merge\*(C'\fR or \f(CW\*(C`\-\-force\*(C'\fR strategy. The latter is the
|
277
275
|
same as a \f(CW\*(C`clone \-\-force\*(C'\fR operation, using the current remote and branch.
|
278
276
|
.Sp
|
279
|
-
When you pull you can assume a fast-forward strategy (default) or you can
|
280
|
-
specify a \f(CW\*(C`\-\-rebase\*(C'\fR, \f(CW\*(C`\-\-merge\*(C'\fR or \f(CW\*(C`\-\-force\*(C'\fR strategy. The latter is the
|
281
|
-
same as a \f(CW\*(C`clone \-\-force\*(C'\fR operation, using the current remote and branch.
|
282
|
-
.Sp
|
283
277
|
Like the \f(CW\*(C`clone\*(C'\fR command, \f(CW\*(C`pull\*(C'\fR will squash all the changes (since the last
|
284
278
|
pull or clone) into one commit. This keeps your mainline history nice and
|
285
279
|
clean. You can easily see the subrepo's history with the \f(CW\*(C`git log\*(C'\fR command:
|
@@ -303,7 +297,7 @@ the \f(CW\*(C`branch\*(C'\fR command and merge things yourself before pushing if
|
|
303
297
|
(although that is probably a rare use case).
|
304
298
|
.Sp
|
305
299
|
The \f(CW\*(C`push\*(C'\fR command requires a branch that has been properly merged/rebased
|
306
|
-
with the upstream \s-1HEAD
|
300
|
+
with the upstream \s-1HEAD\s0 (unless the upstream \s-1HEAD\s0 is empty, which is common
|
307
301
|
when doing a first \f(CW\*(C`push\*(C'\fR after an \f(CW\*(C`init\*(C'\fR). That means the upstream \s-1HEAD\s0 is
|
308
302
|
one of the commits in the branch.
|
309
303
|
.Sp
|
@@ -417,8 +411,8 @@ Example to update the \f(CW\*(C`method\*(C'\fR option for a subrepo:
|
|
417
411
|
Same as \f(CW\*(C`git help subrepo\*(C'\fR. Will launch the manpage. For the shorter usage,
|
418
412
|
use \f(CW\*(C`git subrepo \-h\*(C'\fR.
|
419
413
|
.Sp
|
420
|
-
Use \f(CW\*(C`git subrepo help <command
|
421
|
-
all
|
414
|
+
Use \f(CW\*(C`git subrepo help <command>\*(C'\fR to get help for a specific command. Use
|
415
|
+
\&\f(CW\*(C`\-\-all\*(C'\fR to get a summary of all commands.
|
422
416
|
.Sp
|
423
417
|
The \f(CW\*(C`help\*(C'\fR command accepts the \f(CW\*(C`\-\-all\*(C'\fR option.
|
424
418
|
.ie n .IP """git subrepo version [\-q|\-v]""" 4
|
@@ -736,11 +730,14 @@ The \f(CW\*(C`git\-subrepo\*(C'\fR repo itself has 2 subrepos under the \f(CW\*(
|
|
736
730
|
Written in (very modern) Bash, with full test suite. Take a look.
|
737
731
|
.IP "\(bu" 4
|
738
732
|
A \f(CW\*(C`.gitrepo\*(C'\fR file never is in the top level dir (next to a \f(CW\*(C`.git/\*(C'\fR dir).
|
739
|
-
.SH "
|
740
|
-
.IX Header "
|
741
|
-
|
733
|
+
.SH "Authors"
|
734
|
+
.IX Header "Authors"
|
735
|
+
.IP "\(bu" 4
|
736
|
+
Ingy döt Net <ingy@ingy.net>
|
737
|
+
.IP "\(bu" 4
|
738
|
+
Magnus Carlsson <grimmymail@gmail.com>
|
742
739
|
.SH "License and Copyright"
|
743
740
|
.IX Header "License and Copyright"
|
744
741
|
The \s-1MIT\s0 License (\s-1MIT\s0)
|
745
742
|
.PP
|
746
|
-
Copyright (c) 2013\-
|
743
|
+
Copyright (c) 2013\-2020 Ingy döt Net
|