#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)
Change History (10)
comment:1 Changed 11 years ago by gorticus (Jason Mitchell)
comment:2 Changed 11 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 11 years ago by ryandesign (Ryan Carsten 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 11 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?
Changed 10 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 10 years ago by gorticus (Jason Mitchell)
Added updated patch file to provide address several issues:
- enable
subportsusing solution suggested in ticket:40831#comment:2 to address problem mentioned in comment:4 above, for settingnameaftergithub.setup- ports:
git-flow,git-flow-devel,git-flow-avh,git-flow-hf
- ports:
- includes update provided by
ciserlohn@...in #37279 (r120912) re:git-core=>git - provides two solutions paths, i.e.,
git-flow-develorgit-flow-avhto address #44401
comment:8 follow-up: 9 Changed 10 years ago by neverpanic (Clemens Lang)
| Cc: | cal@… added |
|---|---|
| Resolution: | → fixed |
| Status: | new → closed |
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.
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.