Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 12 Mar 2019 20:55:30 +0000 (UTC)
From:      Koop Mast <kwm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r495524 - in head/devel/gitflow: . files
Message-ID:  <201903122055.x2CKtUwV086883@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kwm
Date: Tue Mar 12 20:55:30 2019
New Revision: 495524
URL: https://svnweb.freebsd.org/changeset/ports/495524

Log:
  Add upstream patch to fix syntax error in git flow init.
  
  PR:		236498
  Approved by:	maintainer
  Obtained from:	upstream

Added:
  head/devel/gitflow/files/
  head/devel/gitflow/files/patch-git-flow-init   (contents, props changed)
Modified:
  head/devel/gitflow/Makefile

Modified: head/devel/gitflow/Makefile
==============================================================================
--- head/devel/gitflow/Makefile	Tue Mar 12 20:51:49 2019	(r495523)
+++ head/devel/gitflow/Makefile	Tue Mar 12 20:55:30 2019	(r495524)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gitflow
 PORTVERSION=	1.12.1
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	nbari@tequila.io

Added: head/devel/gitflow/files/patch-git-flow-init
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/gitflow/files/patch-git-flow-init	Tue Mar 12 20:55:30 2019	(r495524)
@@ -0,0 +1,22 @@
+From aad4610f5dfe133b323d4ccb97e44af0825b0d9d Mon Sep 17 00:00:00 2001
+From: Peter van der Does <peter@avirtualhome.com>
+Date: Sat, 2 Mar 2019 09:54:39 -0500
+Subject: [PATCH] Missing )
+
+---
+ git-flow-init | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/git-flow-init b/git-flow-init
+index 0699ce75..4cc7ed96 100644
+--- git-flow-init
++++ git-flow-init
+@@ -375,7 +375,7 @@ file=    use given config file
+ 	# Support branches
+ 	if ! git config --get gitflow.prefix.support >/dev/null 2>&1 || flag force; then
+ 	    if [ "$FLAGS_support" != "" ]; then
+-	        default_suggestion=$(echo $FLAGS_support
++	        default_suggestion=$(echo $FLAGS_support)
+         else
+ 		    default_suggestion=$(git config --get gitflow.prefix.support || echo support/)
+         fi



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903122055.x2CKtUwV086883>