Git related Questions

[randi]

Is it just "git pull" (which seems to work)?

Git pull is the standard way to fetch any updates from the remote repository and merge them into the currently active branch.

[Graf Zahl]

Well, at least with TortoiseGit there seems to be a discrepancy between pull and fetch. With pull I only seem to update the state of the active branch but with fetch the entire local repo gets updated.
It doesn't seem to be perform pulls across all branches.

[Nash]

Whenever I compile ZDoom, the version number always reads <unknown version>. Do I need to do anything extra now that ZDoom switched to Git? I've already installed TortoiseGit and added the directory to VC++ Directories. There are no compiling errors showing up.

Sorry to bump this. I'm having a lot of trouble getting the Git info for homebrew builds. Git is already in my environment path - I can type git in a CLI from any directory, and moreover, building (G)ZDoom shows the revision name correctly.

However when trying to build projects that are forked off (G)ZDoom, the version info can't be retrieved and it says < unknown version > in the title bar.

The output in Visual Studio says:

Code: Select all

1>------ Build started: Project: revision_check, Configuration: Release Win32 ------
1>  fatal: No names found, cannot describe anything.
1>  Failed to get commit info: No error

Help!

[Edward-san]

This sounds like due to the fact that maybe your fork doesn't have a proper tag? See this discussion ( revision_check calls 'git describe --tags' , btw). Do you get the same error when compiling directly the original gzdoom repository?

[VoidMage]

IMHO, the way (G)ZDoom picks version name from git is somewhat naive, to put it mildly.

In example, if I'm building from my own branch (which is pretty standard while working with git), it tries to construct something from that branch name, which is usually meaningless.

Though, it's not as if that really matters, so I consider this bikeshedding.

[Nash]

Partially solved Solved: when adding remotes to upstream, be sure to NOT disable remote tag fetching (the dialog box seems to suggest disabling it, therefore inexperienced users will have the tendency to click Yes) and then immediately allow it to fetch from the upstream remote. Finally, do a pull from upstream to update your files.

Thanks Edward-san!

[Graf Zahl]

It's indeed a bit strange how it handles tags. This will confuse many users which are new to Git.

[Nash]

Okay I spoke too soon.

https://github.com/nashmuhandes/GZDoom-GPL <-- this repo, which has Graf Zahl's GZDoom as an upstream remote, has no problems. If I clone GZDoom-GPL on my hard disk and build it, the Git revision is retrieved correctly - PROVIDED I be sure to allow remote tag fetching etc as detailed in my previous post.

NOW, if I make a completely separate repository and add https://github.com/nashmuhandes/GZDoom-GPL as an upstream remote (NOT GZDoom), the Git version says <unknown version> again. Does not matter if I allow tag fetching or not - it just does not work.

Why?!

[_mental_]

Okay I spoke too soon.

https://github.com/nashmuhandes/GZDoom-GPL <-- this repo, which has Graf Zahl's GZDoom as an upstream remote, has no problems. If I clone GZDoom-GPL on my hard disk and build it, the Git revision is retrieved correctly - PROVIDED I be sure to allow remote tag fetching etc as detailed in my previous post.

NOW, if I make a completely separate repository and add https://github.com/nashmuhandes/GZDoom-GPL as an upstream remote (NOT GZDoom), the Git version says <unknown version> again. Does not matter if I allow tag fetching or not - it just does not work.

Why?!

Because https://github.com/nashmuhandes/GZDoom-GPL doesn't have any tags. I guess you didn't push tags initially.

[Edward-san]

Also, imho you should create a tag like GZGPL_1.0pre or similar, pointing to the first commit with your name in your fork, so that your program version string would include information related to your fork instead of GZDoom's.

[Nash]

Ahh I see. So quick question, what does the "pre" means? Just trying to understand the naming convention so I can make my tags consistent.

[_mental_]

Ahh I see. So quick question, what does the "pre" means? Just trying to understand the naming convention so I can make my tags consistent.

I think 'pre' designates development builds of version that is not released yet. Something like 'alpha' or 'beta' versions.

[Nash]

Finally got around to this, ugh real-life has been crazy. Just dropped in to say thanks for all the help; version name is now baked into the EXE correctly. So bottom line is; your repo must have tags otherwise it will say <unknown version>. Leaving this here for future reference.

[Gez]

In the GZDoom and ZDoom repositories it's used like this at least. Development builds are labeled 2.1pre because they're not 2.1 yet. It's either that or calling them 2.0post...

[Nash]

What is the best way to see a list of branches that only I added into my ZDoom fork? I'm coming back to the ZDoom codebase for a few months now and I've lost track of what branches I've made...