Skip to content

Commit f4ba976

Browse files
rchiodorchiodo
authored
Subrepo command wasn't checked in correctly (#1737)
* Remove subrepo * Fix subrepo
1 parent 73be8fb commit f4ba976

File tree

189 files changed

+12841
-1
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

189 files changed

+12841
-1
lines changed

‎build/git-subrepo

-1
This file was deleted.

‎build/git-subrepo/.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text eol=lf

‎build/git-subrepo/.gitrepo

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
; DO NOT EDIT (unless you know what you are doing)
2+
;
3+
; This subdirectory is a git "subrepo", and this file is maintained by the
4+
; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
5+
;
6+
[subrepo]
7+
remote = https://github.com/ingydotnet/git-subrepo.git
8+
branch = 0.4.1
9+
commit = a04d8c2e55c31931d66b5c92ef6d4fe4c59e3226
10+
parent = b341532bdd2eacaddca2d9c63421ef3ac9d3d239
11+
method = merge
12+
cmdver = 0.4.1

‎build/git-subrepo/.rc

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#!bash
2+
3+
#------------------------------------------------------------------------------
4+
#
5+
# This is the `git-subrepo` initialization script.
6+
#
7+
# This script turns on the `git-subrepo` Git subcommand, its manpages and TAB
8+
# completion for the *Bash* and *zsh* shells.
9+
#
10+
# Just add a line like this to your shell startup configuration:
11+
#
12+
# source /path/to/git-subrepo/.rc
13+
#
14+
#------------------------------------------------------------------------------
15+
16+
if [[ ${BASH_VERSION} ]]; then
17+
if [[ ${BASH_VERSINFO[0]} -lt 4 ]] ; then
18+
echo "The git-subrepo command requires that 'Bash 4+' is installed."
19+
echo "It doesn't need to be your shell, but it must be in your PATH."
20+
if [[ $OSTYPE == darwin* ]]; then
21+
echo "You appear to be on macOS."
22+
echo "Try: 'brew install bash'."
23+
echo "This will not change your user shell, it just installs 'Bash 5.x'."
24+
fi
25+
return
26+
fi
27+
fi
28+
29+
[[ -n ${ZSH_VERSION-} ]] &&
30+
GIT_SUBREPO_ROOT=$0 ||
31+
GIT_SUBREPO_ROOT=$BASH_SOURCE
32+
[[ $GIT_SUBREPO_ROOT =~ ^/ ]] ||
33+
GIT_SUBREPO_ROOT=$PWD/$GIT_SUBREPO_ROOT
34+
export GIT_SUBREPO_ROOT=$(cd "$(dirname "$GIT_SUBREPO_ROOT")"; pwd)
35+
36+
export PATH=$GIT_SUBREPO_ROOT/lib:$PATH
37+
export MANPATH=$GIT_SUBREPO_ROOT/man:$MANPATH
38+
source "$GIT_SUBREPO_ROOT/share/enable-completion.sh"

‎build/git-subrepo/.travis.yml

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
language: shell
2+
3+
matrix:
4+
include:
5+
- name: Git 2.21 on Ubuntu Xenial
6+
dist: xenial
7+
language: shell
8+
9+
# === This will need to removed when Travis drops support ===
10+
- name: Git 2.15.1 on Ubuntu Trusty
11+
dist: trusty
12+
language: shell
13+
14+
- name: Git on Mac
15+
os: osx
16+
osx_image: xcode8.3
17+
addons:
18+
homebrew:
19+
packages:
20+
- bash
21+
update: true
22+
23+
script:
24+
# NOTE: we have to make sure we're on a branch (rather than on a detached HEAD)
25+
# because tests rely on it.
26+
- git checkout -b travis-ci-dummy-branch-name
27+
- GIT_COMMITTER_NAME=Bob
28+
GIT_COMMITTER_EMAIL=bob@blob.net
29+
GIT_AUTHOR_NAME='Bob Blob'
30+
GIT_AUTHOR_EMAIL=bob@blob.net
31+
PROVEOPT=-v make test

‎build/git-subrepo/Changes

+110
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
---
2+
version: 0.4.1
3+
date: Thu Jan 9 17:11:21 CST 2020
4+
- Fix Bash version error messages and add to .rc
5+
- Nicer YAML formatting in .travis.yml
6+
- Wrap a long line
7+
- Update the docs
8+
- Force `make update` to always update docs
9+
- Don't use XXX in perl stuff
10+
- Add testing on MacOS
11+
- Remove conflicting -C from install -d commands.
12+
- Update version requirement documentation
13+
- Correct error message in branch
14+
- Use topo-order in subrepo branch
15+
- Make “git subrepo clean -f ...” delete refs correctly
16+
- Fix #410 Push empty repositories with recent git versions
17+
- Make subrepo work when run in a worktree
18+
- Simplify finding subrepos
19+
- Ask git to find the .gitrepo files
20+
- Doc: fix sentence repetition
21+
- Fix typos
22+
- Fixed typo
23+
- Travis CI not checking out a branch.
24+
---
25+
version: 0.4.0
26+
date: Thu Nov 8 12:26:38 CET 2018
27+
changes:
28+
- Fix #325 Do not squash main repo commits
29+
- Improve error message for worktree handling
30+
- Make version checking portable. #307
31+
- #307, improve version check
32+
- #307, update version requirement
33+
- Fix part #308, Add stderr output if commands fail
34+
- Fix #306: Add check to prevent following commits with no .gitrepo
35+
- Remove dry-run flag as it's not implemented. Make sure branch --force delete worktree
36+
- Fix #296, Replace --first-parent with --ancestry-path
37+
- Fix #291, specify Trusty host to get new 2.x git
38+
- Fix #258, add --no-tags to git fetch
39+
- Test that no remotes are created during clone
40+
- #257 Remove remote creation to avoid problems with fetch --all
41+
- (origin/issue/150_to_0.4.0) Fix remove-worktree, remove unused parameters
42+
- Regenerate completion files
43+
- filter-branch operation should not be done on HEAD
44+
- Cleanup push and add hint to push directly after pull
45+
- Simplify cleanup and add worktree to status
46+
- Add --method option to init/clone, add a 'config' command
47+
- Updated unit tests to support the new logic
48+
- Use 'git worktree' for merge/rebase
49+
- Update docs to reflect how things should work
50+
- Make it possible to specify commit messages
51+
- Redesign, trash the tree hash approach and use merges instead
52+
- Add release branches to travis-ci
53+
- Add --method option to init/clone, add a 'config' command
54+
- Detect multiple pulls, use -u flag to decide
55+
- Don't reuse previous commit message when using --all
56+
- Update the docs for pull and push
57+
- Update error messages when failing merge/rebase
58+
- Fix env var bug in test/push.t
59+
- Do not overwrite author information
60+
---
61+
version: 0.3.1
62+
date: Tue Jan 3 23:08:56 PST 2017
63+
changes:
64+
- Updated release for homebrew
65+
- Fix #192
66+
---
67+
version: 0.3.0
68+
date: Wed Dec 2 19:19:43 PST 2015
69+
changes:
70+
- Fix issue #98 and host of others (89, 91, 95, 96)
71+
- Adds support for the merge-base command
72+
- Adds stability to many commands
73+
- Command completion updates
74+
- Rename `init` to `.rc`
75+
- @grimmySwe++ @dzzh++ @jrosdahl++ @perlpunk++
76+
---
77+
version: 0.2.3
78+
date: Sun Aug 9 13:44:22 PDT 2015
79+
changes:
80+
- Fix issues #75 and #76
81+
---
82+
version: 0.2.2
83+
date: Wed Jul 22 09:45:13 PDT 2015
84+
changes:
85+
- Added the `init` subcommand
86+
- Applied doc fixes
87+
---
88+
version: 0.2.1
89+
date: Sat Mar 28 07:52:22 PDT 2015
90+
changes:
91+
- Allows subrepo clone to clone to an empty branch; fixes #26.
92+
- Refs in status
93+
- Empty parent set to 'none' in .gitrepo file.
94+
- Bug fixes
95+
---
96+
version: 0.2.0
97+
date: Sat Jan 24 06:22:05 PST 2015
98+
changes:
99+
- Massive overhaul
100+
- .gitrepo files remain the same so backwards compatible
101+
- Introduce the branch and commit subcommands
102+
- The checkout subcommand goes away
103+
- Operations work much smoother like normal Git flow
104+
- Much more testing
105+
- Better doc
106+
---
107+
version: 0.1.0
108+
date: Fri Feb 21 12:25:53 2014 -0800
109+
changes:
110+
- First version

0 commit comments

Comments
 (0)