Angband.oook.cz
Angband.oook.cz
AboutVariantsLadderForumCompetitionComicScreenshotsFunniesLinks

Go Back   Angband Forums > Angband > Development

Reply
 
Thread Tools Display Modes
Old January 25, 2020, 04:42   #1
eastwind
Apprentice
 
Join Date: Dec 2019
Location: Mexico, undisclosed location
Posts: 79
eastwind is on a distinguished road
Silly Git question

What are the git URLs (for cloning) for v 4.2.0 and master?

I see many references to http://github/angband/angband and I can clone that, but I'm not sure what I'm getting or how to get the other of the two I'm interested in.

(For VS integration, which I am trying to write some documentation up for, it's important to know the URL and clone from within VS rather than the web site.)
eastwind is offline   Reply With Quote
Old January 25, 2020, 05:10   #2
Nick
Vanilla maintainer
 
Nick's Avatar
 
Join Date: Apr 2007
Location: Canberra, Australia
Age: 55
Posts: 8,338
Donated: $60
Nick will become famous soon enough
There's a branch button near the top left. By default it shows master; if you want 4.2.0, change to 4.2-release.

That said, I think if you just clone angband/angband by default you get all the branches.
__________________
One for the Dark Lord on his dark throne
In the Land of Mordor where the Shadows lie.
Nick is offline   Reply With Quote
Old January 25, 2020, 05:30   #3
eastwind
Apprentice
 
Join Date: Dec 2019
Location: Mexico, undisclosed location
Posts: 79
eastwind is on a distinguished road
I'm not using the git web page, I'm trying to figure out how to use git from within Visual Studio. So there's no pull-down for which version to get, you have to specify that via the url you clone.

Anyway, angband/angband seems to have given me master, as I was able to fetch the changes you committed today, including the one for #4236.

Hopefully I'll be able to offer up a pull request soon for the other VS compilation fixes.
eastwind is offline   Reply With Quote
Old January 26, 2020, 00:37   #4
takkaria
Veteran
 
takkaria's Avatar
 
Join Date: Apr 2007
Posts: 1,947
Donated: $40
takkaria is on a distinguished road
VS must have a way to handle this that isn't using a URL, because URLs don't specify particular branches in git. You have a URL that allows you to clone a whole repository, which includes all branches and revisions. Then in your local copy you choose ('check out') what you want in your working directory.
__________________
takkaria whispers something about options. -more-
takkaria is offline   Reply With Quote
Old January 26, 2020, 01:12   #5
Pete Mack
Prophet
 
Join Date: Apr 2007
Location: Seattle, WA
Posts: 5,737
Donated: $40
Pete Mack is on a distinguished road
You want angband/angband. Don't worry about other stuff; the only important git synchronization is to keep your branch synced with HEAD, and to push changes for staging at github. All other actions will be local (commit, diff, log, etc)
Pete Mack is offline   Reply With Quote
Old January 26, 2020, 01:28   #6
eastwind
Apprentice
 
Join Date: Dec 2019
Location: Mexico, undisclosed location
Posts: 79
eastwind is on a distinguished road
What I did was make a fork, Eastwind921/Angband, off of angband/angband (the master) using the web interface. But then when I cloned (which I did using Visual Studio's GitHub extension) I cloned Http://github.com/angband/angband, when I should have cloned my fork instead, which is apparently Http://github.com/Eastwind921/angband.

And so then I wasn't able to push my changes properly.

So anyone else reading, don't do that.

Try number 2 is underway using a clone of Http://github.com/Eastwind921/angband, we'll see how that works for me.
eastwind is offline   Reply With Quote
Old January 26, 2020, 03:57   #7
eastwind
Apprentice
 
Join Date: Dec 2019
Location: Mexico, undisclosed location
Posts: 79
eastwind is on a distinguished road
I'm still struggling with Git.

The first change got done properly and merged in by Nick.

Then I started the second change, the addition of 5 new files. I first synced my local repository, then added the files, then staged them, then stashed them, then pushed them to Eastwind921/angband.

But at that point the web client showed Eastwind921/angband being 2 commits ahead and one commit behind master - rather than 1 commit ahead as I expected. When I ran the compare, it was still showing me the 3 edited files from the prior commit as well as the 5 new files.

So I thought I should revert the second push, and I did that, and now it shows me *3* commits ahead, as the reversion didn't erase the prior push, it just made another change removing those files.

Ugh! deeper and deeper.

Does git expect me to set up a fresh fork off of master for each thing I want to commit? That's easy enough in the web client, but the work needed on the local side to download the repository, get the VS project files working, etc, is non-trivial.

What do I do from here?
eastwind is offline   Reply With Quote
Old January 26, 2020, 04:33   #8
Pete Mack
Prophet
 
Join Date: Apr 2007
Location: Seattle, WA
Posts: 5,737
Donated: $40
Pete Mack is on a distinguished road
reversion does not erase changes, just undoes them (so they still show in the lot). And you will be ahead on commits until the pull request is processed.
Pete Mack is offline   Reply With Quote
Old January 26, 2020, 04:37   #9
eastwind
Apprentice
 
Join Date: Dec 2019
Location: Mexico, undisclosed location
Posts: 79
eastwind is on a distinguished road
What does 'until the pull request is processed' mean? Nick did his thing, I thought that was all that needed to happen. Do I need to wait on GitHub to do some post-merge processing?
eastwind is offline   Reply With Quote
Old January 26, 2020, 04:42   #10
Pete Mack
Prophet
 
Join Date: Apr 2007
Location: Seattle, WA
Posts: 5,737
Donated: $40
Pete Mack is on a distinguished road
My bad. You can see the difference here:
https://github.com/angband/angband/c...wind921:master
Soat least sone change is outstanding
Pete Mack is offline   Reply With Quote
Reply


Currently Active Users Viewing This Thread: 1 (0 members and 1 guests)
 
Thread Tools
Display Modes

Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

BB code is On
Smilies are On
[IMG] code is On
HTML code is Off

Forum Jump

Similar Threads
Thread Thread Starter Forum Replies Last Post
silly angband question #4 Sky Vanilla 15 December 5, 2016 14:24
silly angband question #3 Sky Vanilla 12 November 14, 2016 00:41
Blessing silly question Skrym Vanilla 1 November 26, 2012 12:31
Probably a silly question Mr Mushroom Vanilla 4 May 31, 2011 05:55
Silly question, but... steeg1234321 Vanilla 13 March 28, 2008 18:17


All times are GMT +1. The time now is 02:32.


Powered by vBulletin® Version 3.8.11
Copyright ©2000 - 2020, vBulletin Solutions Inc.