johu        15/01/26 21:06:09

  Added:                git-flow-1.8.0-unbundle-shflags.patch
  Log:
  Version bump, switch to active fork project, bug #537870. Thanks to Jochen 
Radmacher <jradmac...@gmx.de>.
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 
F3CFD2BD)

Revision  Changes    Path
1.1                  
dev-vcs/git-flow/files/git-flow-1.8.0-unbundle-shflags.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-flow/files/git-flow-1.8.0-unbundle-shflags.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/git-flow/files/git-flow-1.8.0-unbundle-shflags.patch?rev=1.1&content-type=text/plain

Index: git-flow-1.8.0-unbundle-shflags.patch
===================================================================
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




Reply via email to