diff options
author | 2015-08-08 13:49:04 -0700 | |
---|---|---|
committer | 2015-08-08 17:38:18 -0700 | |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-vcs/git-flow/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-vcs/git-flow/files')
-rw-r--r-- | dev-vcs/git-flow/files/git-flow-0.4.1-unbundle-shflags.patch | 32 | ||||
-rw-r--r-- | dev-vcs/git-flow/files/git-flow-1.8.0-unbundle-shflags.patch | 25 |
2 files changed, 57 insertions, 0 deletions
diff --git a/dev-vcs/git-flow/files/git-flow-0.4.1-unbundle-shflags.patch b/dev-vcs/git-flow/files/git-flow-0.4.1-unbundle-shflags.patch new file mode 100644 index 000000000000..93ecb7248c21 --- /dev/null +++ b/dev-vcs/git-flow/files/git-flow-0.4.1-unbundle-shflags.patch @@ -0,0 +1,32 @@ +diff --git a/Makefile b/Makefile +index fbbfd2c..b0e2490 100644 +--- a/Makefile ++++ b/Makefile +@@ -40,14 +40,12 @@ SCRIPT_FILES+=git-flow-release + SCRIPT_FILES+=git-flow-support + SCRIPT_FILES+=git-flow-version + SCRIPT_FILES+=gitflow-common +-SCRIPT_FILES+=gitflow-shFlags + + all: + @echo "usage: make install" + @echo " make uninstall" + + install: +- @test -f gitflow-shFlags || (echo "Run 'git submodule init && git submodule update' first." ; exit 1 ) + install -d -m 0755 $(prefix)/bin + install -m 0755 $(EXEC_FILES) $(prefix)/bin + install -m 0644 $(SCRIPT_FILES) $(prefix)/bin +diff --git a/git-flow b/git-flow +index 93e9f0f..7b643d3 100755 +--- a/git-flow ++++ b/git-flow +@@ -78,7 +78,7 @@ main() { + export POSIXLY_CORRECT=1 + + # use the shFlags project to parse the command line arguments +- . "$GITFLOW_DIR/gitflow-shFlags" ++ . /usr/share/misc/shflags + FLAGS_PARENT="git flow" + FLAGS "$@" || exit $? + eval set -- "${FLAGS_ARGV}" diff --git a/dev-vcs/git-flow/files/git-flow-1.8.0-unbundle-shflags.patch b/dev-vcs/git-flow/files/git-flow-1.8.0-unbundle-shflags.patch new file mode 100644 index 000000000000..6e96d541d411 --- /dev/null +++ b/dev-vcs/git-flow/files/git-flow-1.8.0-unbundle-shflags.patch @@ -0,0 +1,25 @@ +diff --git a/Makefile b/Makefile +index 0718bbb..f488922 100644 +--- a/Makefile ++++ b/Makefile +@@ -43,7 +43,6 @@ SCRIPT_FILES+=git-flow-version + SCRIPT_FILES+=git-flow-log + SCRIPT_FILES+=git-flow-config + SCRIPT_FILES+=gitflow-common +-SCRIPT_FILES+=gitflow-shFlags + + # Hook files + HOOK_FILES=$(wildcard hooks/*) +diff --git a/git-flow b/git-flow +index 7a962d2..2ba70ba 100755 +--- a/git-flow ++++ b/git-flow +@@ -111,7 +111,7 @@ main() { + fi + + # Use the shFlags project to parse the command line arguments +- . "$GITFLOW_DIR/gitflow-shFlags" ++ . /usr/share/misc/shflags + FLAGS_PARENT="git flow" + + # Load common functionality |