On Thu, Sep 27 2018, Jonathan Nieder wrote: > Hi, > > Ævar Arnfjörð Bjarmason wrote: > >> So it's similar to various packages that have "alternates" and are semi >> or permanently forked, like emacs & xemacs, JDK etc., although I can't >> recall one offhand that's quite similar to GFW v.s. git.git. >> >> My only stake in this is I thought it would be neat to be able to "apt >> install git-for-windows", but I understand there's a support burden, but >> if some *nix packagers are interested, maybe never taking it out of the >> Debian equivalent of "experimental" and saying "this is unsupported, go >> to the GFW tracker..." when bugs are filed would cut down on the support >> burden. > > If someone else wants to package git-for-windows for Debian, I am > happy to offer them advice and will not stop them. Thanks, presumably this is going to be more involved than just downloading the source .deb, replacing the source tarball & s/2.19.0/2.19.0.windows.../, since presumably both would need to be aware of each other not to conflict, or would need update-alternatives integration. > That said, that seems to me like a lot of work to avoid adding some > patches to "next" that belong in "next" anyway. I understand why the > Git for Windows maintainer does not always have time to upstream > promptly, which is why I suggest working with him to find a way to > help with that. > > If there's something I'm missing and Git is actually an uncooperative > upstream like the cases you've mentioned, then I'd be happy to learn > about that so we can fix it, too. That's one and valid way to look at it, convergence would be ideal. Another way to look at it, which is closer to what I was thinking about, is to just view GFW as some alternate universe "next" branch (which by my count is ~2-3k commits ahead of master[1]). >From that perspective if/how/when it's all converging is just inside baseball. I can install git from "testing" in Debian, and get the same version that's probably stress tested by tens of thousands of users, or "experimental" (next) that's probably run by tens or hundreds of people, maybe thousands. I'd just like to have some easy way to install the gfw, which I'm assuming is used by a lot more users than any of those. One reason to do that these days is to get git-stash and git-rebase that's a lot faster, yeah I could just pick those from the ML or build from "pu", but I'm betting the GFW version has been tested a lot more. I can just build it for myself, the reason I sent this mail was just to a) see if there were some packagers that were interested in making non-windows packages for it (e.g. some linux distros) b) it wasn't clear to me before what the extent of the divergence with vanilla git was, and that there wasn't much Windows-specific about GFW, it's just a fork whose maintainer happens to just make releases on that OS (but as I've learned, also tests them on Linux VMs). 1. $ git log --max-parents=1 --pretty=format:%s v2.19.0...v2.19.0.windows.1|sort|uniq|wc -l 2346 sort|uniq because without that we get ~27k commits, a lot of these seem to be automated commits made by some bots.
