#36492 closed enhancement (fixed)
git-core @1.7.12.2 +subtree : add a variant to support git-subtree
| Reported by: | kngspook@… | Owned by: | ci42 |
|---|---|---|---|
| Priority: | Normal | Milestone: | |
| Component: | ports | Version: | 2.1.2 |
| Keywords: | Cc: | kngspook@…, ryandesign (Ryan Carsten Schmidt) | |
| Port: | git-core |
Description
git-subtree has been merged into mainline git as of 1.7.11, but only in the contrib/ tree. This is to add a variant to optionally install git-subtree, much like how we do for contrib/credential/osxkeychain.
Patch attached.
Attachments (1)
Change History (13)
Changed 12 years ago by kngspook@…
| Attachment: | git-core-Portfile-v1.patch added |
|---|
comment:1 Changed 12 years ago by kngspook@…
Manpages as a whole are not shipped with git-core by default; instead we automatically download a separate git-manpages package that the git maintainers provide, and that contains manpages for all the default git commands (some other package management systems treat git's manpages as a separate package).
Unfortunately, git similarly doesn't ship with a manpage for git-subtree in contrib/subtree/. Instead they generate it at the "make install-doc" phase, and the generation uses asciidoc and xmlto. I filed a request with them that they do so (https://code.google.com/p/git-core/issues/detail?id=18), but in the meantime I wasn't sure what to do. I could've provided a patch that would've dropped the manpage into the contrib/ directory, but that didn't seem sustainable (though I don't anticipate the manpage to change frequently -- it hasn't from v.1.7.12 to v1.8.0), so if building with +subtree, we pull in a bunch of other dependencies...
comment:3 Changed 12 years ago by ryandesign (Ryan Carsten Schmidt)
Could git-subtree be a subport? Or installed always? It would be better to not add any more variants.
comment:5 Changed 12 years ago by kngspook@…
I'm not familiar with subports, and I'm having trouble finding documentation for it.
I'd be happy to have it installed always. I suspect the git maintainers will move it into git-core proper in the near future (though it's still in contrib/ in v1.8.0) since it seems to be rapidly gaining traction these days.
Would you like me to make a patch for it to be always installed?
comment:6 Changed 12 years ago by ci42
| Keywords: | git-subtree removed |
|---|---|
| Owner: | changed from macports-tickets@… to ciserlohn@… |
| Type: | update → enhancement |
Has dulplicate: #36138
comment:7 Changed 12 years ago by ci42
It think it should always be installed as I agree that the git maintainers will include git-subtree into git-core in the near future. And if not, the additional install will not hurt anyone - if you dont't need it, just you don't use it.
comment:9 Changed 12 years ago by kngspook@…
The one downside to install-by-default that I see is all the additional dependencies it pulls in for the manpage at the moment. Are you guys okay with that?
comment:10 Changed 12 years ago by kngspook@…
The other option is to use the patch I sent to the git maintainers to add the manpage, but we'd have to update that ourselves every time subtree's docs get updated.
comment:11 Changed 12 years ago by ci42
| Resolution: | → fixed |
|---|---|
| Status: | new → closed |
As of git-core 1.7.12.3 git-subtree is included by default (r98609).
Attempt #1 to add a +subtree variant to git-core.