Comboman |
Can't think of a good title
|
|
|
Reged: 12/30/12
|
Posts: 431
|
Loc: Halifax, Canada
|
|
Send PM
|
|
|
Need help with Git
#335820 - 01/07/15 05:24 AM
|
|
|
I'm trying to make some contributions to MAME but I don't think it's working. When I commit my changes using Tortoise Git, my changes show up in the log, but when I check the Github website I don't see my submissions. Is there something else I need to do? Do my submissions need to be approved before they show up on the website?
Here is what I see in Tortoise:
Here is what I see on Github.com:
|
|
|
|
Re: Need help with Git
[Re: Comboman]
#335823 - 01/07/15 08:56 AM
|
|
|
Are you doing it as a Pull Request? External contibutors can't commit directly to the tree.
|
.
|
|
Comboman |
Can't think of a good title
|
|
|
Reged: 12/30/12
|
Posts: 431
|
Loc: Halifax, Canada
|
|
Send PM
|
|
|
Re: Need help with Git
[Re: Osso1]
#335825 - 01/07/15 02:05 PM
|
|
|
> Are you doing it as a Pull Request? > External contibutors can't commit directly to the tree.
I right click on the file and select Git Commit -> "master" then fill in the message and author, etc.
What is the correct way for external contributors to submit?
|
|
|
|
Re: Need help with Git
[Re: Comboman]
#335826 - 01/07/15 02:14 PM
|
|
|
Extrapolating from the FAQ located at http://wiki.mamedev.org/index.php/Submitting_Source_Code
Quote:
Using GitHub
You need to create/own a GitHub account and fork the project allowing you to have an up-to-date copy of the source. With a valid account, you can then assemble local tree changes and send to our tree as a pull request. Please be clear in the comments and limit the amount of actual local tree commits made in order to create your updated code.
Using External .diff
To create a correct diff, use the following command line below. originaltree is the (src) directory of the original, unmodified sources; modifiedtree is the (src) directory of your updated sources; and patchname.diff is the name of the diff you want to create.
DIFF -Nru originaltree modiifiedtree > patchname.diff
Once you have a .diff containing your changes, ZIP it up and submit it by sending email
|
.
|
|
Comboman |
Can't think of a good title
|
|
|
Reged: 12/30/12
|
Posts: 431
|
Loc: Halifax, Canada
|
|
Send PM
|
|
|
Re: Need help with Git
[Re: Osso1]
#335844 - 01/08/15 05:16 AM
|
|
|
Thanks. I could not find a way to do a pull request with the TortoiseGit Windows client but I was able to submit a pull request with the Github web interface.
|
|
|
|
Re: Need help with Git
[Re: Comboman]
#335847 - 01/08/15 10:41 AM
|
|
|
Glad it worked for you! OG just merged your pull request.
|
.
|
|