[osg-users] Submission/Pull Request problems on github

[Robert Osfield]

Hi Jannik,

Thanks for the info.  Looks like my fix of the author name/email
address yesterday created all these problems with pull requests.

I've developed rather a love/hate relationship with git and github.
Some things going really smoothly but then can turn around and bite
you and just throw lots of road blocks in you way, constraining you to
work with certain path or break things.  So far git has created far
more work for me than it's saved.

I find it a bit depressing that there is still so much more to learn
about git and github before I can safely master it.  Personally I'd
rather just get on code, fix problems with the OSG itself rather
jumping through hoops to use tools that are "supposed" to help your
work.

For now I have 30 pull requests to fix in some fashion as they aren't
in anyway useful as things stand.  First step will be to get all those
who've made a pull request to fetch the new history then see what
happens on github.  Perhaps it'll automatically fix things, perhaps
the author will have to resubmit.

Do you know what steps do members of the community need to do to fix
things?  Perhaps we can pass instructions on via comments of each pull
request.

Submitted code to osg-submissions might not be perfect but it's been a
hell of lot more reliable and robust than github.

Robert.

On 19 May 2016 at 20:05, Jannik Heller <scrawl at baseoftrash.de> wrote:
> Hi Robert,
>
> by fixing the author names you have essentially re-written the repository history. This means that everyone who submitted pull-requests in the past will have to manually rebase their changes on top of the new history. But it's not so difficult to do that if you know how to use the git rebase tool.
>
> The github document "Changing author info" (which I assume you were looking at?) does state this caveat:
>
> "Note: Running this script rewrites history for all repository collaborators. After completing these steps, any person with forks or clones must fetch the rewritten history and rebase any local changes into the rewritten history."
>
> In the future you may want to avoid rewriting history (i.e. anything that requires a force-push) since it does cause disruption for people that have already sent in changes. But it's not a big deal now since github is not even the official submission route yet.
>
> As for checking out the changes in pull requests that were not adapted, you can look at the author's repository (e.g. https://github.com/vivijind/OpenSceneGraph/commits/master shows the commits for PR https://github.com/openscenegraph/OpenSceneGraph/pull/68). In some cases it looks like the authors have deleted their repository, but you can still check out the pull request locally ( https://help.github.com/articles/checking-out-pull-requests-locally/ ) and from there look at the included commits.
>
> Cheers,
> Jannik
>
> ------------------
> Read this topic online here:
> http://forum.openscenegraph.org/viewtopic.php?p=67161#67161
>
>
>
>
>
> _______________________________________________
> osg-users mailing list
> osg-users at lists.openscenegraph.org
> http://lists.openscenegraph.org/listinfo.cgi/osg-users-openscenegraph.org