Bug 240577 - devel/gitflow: Update to 1.12.3
Summary: devel/gitflow: Update to 1.12.3
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Kai Knoblich
URL: https://github.com/petervanderdoes/gi...
Depends on:
Reported: 2019-09-14 09:04 UTC by nbari
Modified: 2019-09-16 11:04 UTC (History)
2 users (show)

See Also:
kai: maintainer-feedback+

gitflow 1.12.3 (986 bytes, patch)
2019-09-14 09:04 UTC, nbari
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description nbari 2019-09-14 09:04:47 UTC
Created attachment 207482 [details]
gitflow 1.12.3

Update to 1.12.3
Comment 1 Kai Knoblich freebsd_committer 2019-09-14 19:38:37 UTC

thank you for the patch. I assume that the patch "patch-git-flow-init" is no longer required since upstream has fixed it in 1.12.2:

> ===>  Applying FreeBSD patches for gitflow-1.12.3_1
> Ignoring previously applied (or reversed) patch.
> 1 out of 1 hunks ignored--saving rejects to git-flow-init.rej
> => FreeBSD patch patch-git-flow-init failed to apply cleanly.
> *** Error code 1

Without the patch everything builds fine. One question: Are there new patches that need to be added?

Beside that the line with "PORTREVISION" needs to be removed (or set back to "0") as the "PORTVERSION" was increased.

I already removed that line in my local repository so you don't need to update the attached patch if there's nothing more (e.g. additional patches) to add.
Comment 2 nbari 2019-09-14 19:42:01 UTC
Hi, no extra patches required.

Thanks :)
Comment 3 commit-hook freebsd_committer 2019-09-16 10:09:25 UTC
A commit references this bug:

Author: kai
Date: Mon Sep 16 10:08:30 UTC 2019
New revision: 512155
URL: https://svnweb.freebsd.org/changeset/ports/512155

  devel/gitflow: Update to 1.12.3

  * Remove patch "patch-git-flow-init" that is no longer required. [1]

  While I'm here:

  * Group USES block with related USE_ variables and move OPTIONS_DEFINE
    further down according to the PHB.

  Changelog since 1.12.1:

  * Explicitly get the default values from the system and global config
  * Fix missing parentheses [1]

  PR:		240577
  Submitted by:	nbari@tequila.io (maintainer)

Comment 4 Kai Knoblich freebsd_committer 2019-09-16 10:13:11 UTC
(In reply to nbari from comment #2)

Committed, thank you for the patch and the quick reply!

One pro-tip for your next submission: You can speed up the process by setting "maintainer-approval" (not to be confused with the "maintainer-feedback" flag) on the attachment to "+" for ports you maintain. ;)
Comment 5 nbari 2019-09-16 11:04:24 UTC
Got it, many thanks :-)