Hi y'all, I know we've had a Gitweb vs Github thing going for years where GIthub is just a mirror. But I saw something interesting today on Apache Jena's Gitweb where it seems that they'd merged commits from Github into their master repo. You can see it at https://git-wip-us.apache.org/repos/asf?p=jena.git and specifically with https://git-wip-us.apache.org/repos/asf?p=jena.git;a=commit;h=466f16558b9cd1 a7a930fbb5e2844610ee8fb373. I guess it doesn't mess with the mirroring because they're not merging into the Github repositories. Rather, they're merging in from pull requests, which appear to just be a different type of git ref. I suppose that doesn't help in terms of tracking things through Bugzilla. but I thought it was interesting nonetheless and thus worth sharing. David Cook Systems Librarian Prosentient Systems 72/330 Wattle St Ultimo, NSW 2007 Australia Office: 02 9212 0899 Direct: 02 8005 0595
Actually, upon further review, maybe they actually applied the changes manually and then merged the pull request just for Github record keeping. It looks like the actual fix happened with https://git-wip-us.apache.org/repos/asf?p=jena.git;a=commit;h=db4a6205ebf045 a866bfad4c4751a3372c34af24 and the "merge" was a few days later with https://git-wip-us.apache.org/repos/asf?p=jena.git;a=commit;h=466f16558b9cd1 a7a930fbb5e2844610ee8fb373 It looks like the Git maintainer is the same person posting to Github anyway, so. I don't really know what's going on there after all David Cook Systems Librarian Prosentient Systems 72/330 Wattle St Ultimo, NSW 2007 Australia Office: 02 9212 0899 Direct: 02 8005 0595 From: koha-devel-bounces@lists.koha-community.org [mailto:koha-devel-bounces@lists.koha-community.org] On Behalf Of David Cook Sent: Monday, 5 February 2018 10:36 AM To: 'koha-devel' <koha-devel@lists.koha-community.org> Subject: [Koha-devel] Gitweb + Github? Hi y'all, I know we've had a Gitweb vs Github thing going for years where GIthub is just a mirror. But I saw something interesting today on Apache Jena's Gitweb where it seems that they'd merged commits from Github into their master repo. You can see it at https://git-wip-us.apache.org/repos/asf?p=jena.git and specifically with https://git-wip-us.apache.org/repos/asf?p=jena.git;a=commit;h=466f16558b9cd1 a7a930fbb5e2844610ee8fb373. I guess it doesn't mess with the mirroring because they're not merging into the Github repositories. Rather, they're merging in from pull requests, which appear to just be a different type of git ref. I suppose that doesn't help in terms of tracking things through Bugzilla. but I thought it was interesting nonetheless and thus worth sharing. David Cook Systems Librarian Prosentient Systems 72/330 Wattle St Ultimo, NSW 2007 Australia Office: 02 9212 0899 Direct: 02 8005 0595
I believe Github can detect if a pull request was merged, whether you merge manually or use the web UI. (By the way, to checkout pull request locally, see https://gist.github.com/piscisaureus/3342247) Anyway, I think it's better to have a single entry point for bugs, patches, etc. Le 05/02/2018 à 00:42, David Cook a écrit :
Actually, upon further review, maybe they actually applied the changes manually and then merged the pull request just for Github record keeping.
It looks like the actual fix happened with https://git-wip-us.apache.org/repos/asf?p=jena.git;a=commit;h=db4a6205ebf045... and the “merge” was a few days later with https://git-wip-us.apache.org/repos/asf?p=jena.git;a=commit;h=466f16558b9cd1...
It looks like the Git maintainer is the same person posting to Github anyway, so… I don’t really know what’s going on there after all
David Cook
Systems Librarian
Prosentient Systems
72/330 Wattle St
Ultimo, NSW 2007
Australia
Office: 02 9212 0899
Direct: 02 8005 0595
*From:*koha-devel-bounces@lists.koha-community.org [mailto:koha-devel-bounces@lists.koha-community.org] *On Behalf Of *David Cook *Sent:* Monday, 5 February 2018 10:36 AM *To:* 'koha-devel' <koha-devel@lists.koha-community.org> *Subject:* [Koha-devel] Gitweb + Github?
Hi y’all,
I know we’ve had a Gitweb vs Github thing going for years where GIthub is just a mirror.
But I saw something interesting today on Apache Jena’s Gitweb where it seems that they’d merged commits from Github into their master repo.
You can see it at https://git-wip-us.apache.org/repos/asf?p=jena.git and specifically with https://git-wip-us.apache.org/repos/asf?p=jena.git;a=commit;h=466f16558b9cd1....
I guess it doesn’t mess with the mirroring because they’re not merging into the Github repositories. Rather, they’re merging in from pull requests, which appear to just be a different type of git ref.
I suppose that doesn’t help in terms of tracking things through Bugzilla… but I thought it was interesting nonetheless and thus worth sharing.
David Cook
Systems Librarian
Prosentient Systems
72/330 Wattle St
Ultimo, NSW 2007
Australia
Office: 02 9212 0899
Direct: 02 8005 0595
_______________________________________________ Koha-devel mailing list Koha-devel@lists.koha-community.org http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-devel website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
-- Julian Maurice <julian.maurice@biblibre.com> BibLibre
participants (2)
-
David Cook -
Julian Maurice