From owner-svn-ports-head@freebsd.org Tue Mar 12 20:55:31 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 26670153E2DE; Tue, 12 Mar 2019 20:55:31 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BAD4A85527; Tue, 12 Mar 2019 20:55:30 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ABE513AD; Tue, 12 Mar 2019 20:55:30 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2CKtUAx086885; Tue, 12 Mar 2019 20:55:30 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2CKtUwV086883; Tue, 12 Mar 2019 20:55:30 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201903122055.x2CKtUwV086883@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Tue, 12 Mar 2019 20:55:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495524 - in head/devel/gitflow: . files X-SVN-Group: ports-head X-SVN-Commit-Author: kwm X-SVN-Commit-Paths: in head/devel/gitflow: . files X-SVN-Commit-Revision: 495524 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: BAD4A85527 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.95)[-0.954,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Mar 2019 20:55:31 -0000 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 +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