summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-vcs/git-flow/files/git-flow-1.8.0-unbundle-shflags.patch')
-rw-r--r--dev-vcs/git-flow/files/git-flow-1.8.0-unbundle-shflags.patch25
1 files changed, 0 insertions, 25 deletions
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
deleted file mode 100644
index 6e96d541d411..000000000000
--- a/dev-vcs/git-flow/files/git-flow-1.8.0-unbundle-shflags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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