Opened 7 years ago

Closed 7 years ago

Last modified 7 years ago

#41609 closed update (fixed)

git-flow update and variants

Reported by: gorticus (Jason Mitchell) Owned by: macports-tickets@…
Priority: Normal Milestone:
Component: ports Version:
Keywords: haspatch maintainer Cc: rlonstein@…, cooljeanius (Eric Gallager), neverpanic (Clemens Lang)
Port: git-flow

Description

Updated git-flow to include two variants:

  • AVH - active AVH addition by Peter van der Does
  • nvie - original Vincent Driessen repository, stale releases

AVH is default and points to most recent release, 1.7.0.

Attachments (1)

git-flow.patch (4.5 KB) - added by gorticus (Jason Mitchell) 7 years ago.
update includes subports: git-flow-devel, git-flow-avh, git-flow-hf

Download all attachments as: .zip

Change History (10)

comment:1 Changed 7 years ago by gorticus (Jason Mitchell)

This will address the comments in Ticket #37378 related to enabling the AVH edition of git-flow. The completion part was something that was never settled from back in Ticket #26818.

Need to think about how to include completion in this port, but the many-shells issue will complicate it.

comment:2 Changed 7 years ago by gorticus (Jason Mitchell)

I should have added that I've tested both variant installs in my setup, 2.2.1, and both worked.

comment:3 Changed 7 years ago by ryandesign (Ryan Schmidt)

A variant should not change a port's version.

You should either switch the port to this maintained fork, or make a subport for it if there is a reason to keep the old one.

comment:4 Changed 7 years ago by gorticus (Jason Mitchell)

For speed, I did a straight update to the AVH fork. If anyone requests it, then I can worry about a subport.

Interestingly, when I tried to do a subport based on ${name}, even though explicitly set, it was set as github, perhaps overridden by the the PortGroup?

comment:5 Changed 7 years ago by rlonstein@…

Cc: rlonstein@… added

Cc Me!

comment:6 Changed 7 years ago by cooljeanius (Eric Gallager)

Cc: egall@… added

Cc Me!

Changed 7 years ago by gorticus (Jason Mitchell)

Attachment: git-flow.patch added

update includes subports: git-flow-devel, git-flow-avh, git-flow-hf

comment:7 Changed 7 years ago by gorticus (Jason Mitchell)

Added updated patch file to provide address several issues:

  • enable subports using solution suggested in ticket:40831#comment:2 to address problem mentioned in comment:4 above, for setting name after github.setup
    • ports: git-flow, git-flow-devel, git-flow-avh, git-flow-hf
  • includes update provided by ciserlohn@... in #37279 (r120912) re: git-core => git
  • provides two solutions paths, i.e., git-flow-devel or git-flow-avh to address #44401

comment:8 Changed 7 years ago by neverpanic (Clemens Lang)

Cc: cal@… added
Resolution: fixed
Status: newclosed

I think the github portgroup will use clone --recursive if you set fetch.type git. Note that running git submodule init in post-fetch requires at least a bin:git:git fetch dependency, which I added. I also removed the workaround from #40831, because that looks like it has been fixed meanwhile.

Committed with these changes in r122828. Please let me know if I should close more tickets than this one and #44401.

comment:9 in reply to:  8 Changed 7 years ago by gorticus (Jason Mitchell)

Replying to cal@…:

... Please let me know if I should close more tickets than this one and #44401.

I just realized it also takes care of the AVH part #37378, but not the completion. It'll be a while before I can get time to add the completions as subports.

Note: See TracTickets for help on using tickets.