Can’t find the 1.11.10 tag

[Luther]

I can't seem to find a git tag for this release. I've done 'git pull origin master'. How do I checkout 1.11.10?


Split from here. ― shadowm

[iceiceice]

That's exactly what you should do. If you pulled master, then you have 1.11.10. At the moment, Master is 1.11.10 + most recent bug fixes.

You can tell what version you have because the title of your wesnoth program window will say something like "The Battle for Wesnoth - 1.11.10+dev (2ed1338-Clean)". (That's what my current master build says.)

[Iris]

I can't seem to find a git tag for this release. I've done 'git pull origin master'. How do I checkout 1.11.10?

Try git fetch origin 1.11.10 and then git checkout 1.11.10.

[AI]

I can't seem to find a git tag for this release. I've done 'git pull origin master'. How do I checkout 1.11.10?

Try git fetch origin 1.11.10 and then git checkout 1.11.10.

I looks like 1.11.10 was tagged with a lightweight tag, while 1.11.9 was tagged with an annotated one.

Code: Select all

$ git describe 
1.11.9-408-g1c4481e
$ git describe --tags
1.11.10-45-g1c4481e

[Luther]

Try git fetch origin 1.11.10 and then git checkout 1.11.10.

Code: Select all

$ git fetch origin 1.11.10
From https://github.com/wesnoth/wesnoth-old
 * tag               1.11.10    -> FETCH_HEAD
$ git checkout 1.11.10
error: pathspec '1.11.10' did not match any file(s) known to git.

When I did the pull earlier, git tried to do some kind of automatic merge and failed. This really makes no sense to me. I have not done any commits. I had passed a CXXFLAGS to the scons invocation, but I don't think that would affect any tracked files. Every once in a while, git does some really bizarre stuff like this, and it's extremely frustrating.

[iceiceice]

Every once in a while, git does some really bizarre stuff like this, and it's extremely frustrating.

It's not your fault or git's fault, unfortunately 1.11.10 got tagged in our repo slightly differently from how previous versions have been tagged, so you can't search for it that way. (Unless the release team changes something). Don't worry, be happy You can find the full 1.11.10 tar ball here, and you can find all the new features plus some at master.

[Luther]

At the risk of side-tracking the thread, I do blame git for allowing these subtle mistakes that lead to massive frustration. Mercurial is more strict about how its repos are structured, and it doesn't have these problems.

[iceiceice]

I'm completely sold. I think we should translate the entire git repo, which we just finished rewriting from svn, to Mercurial, and delete wesnoth-old. shadowm, you are definitely on board with this, right?

Edit: More helpfully, it looks like if people do actually really want to use Mercurial instead of git, there is a plugin to use Mercurial to interact with a git repo on github: http://hg-git.github.io/

[AI]

I've had my own issues with mercurial when I used it. Neither one is a panacea.

As for the automatic merge it tried, how old is your clone? We had a developer force push something a while back, so it could be that you have conflicts from there.
To fix this, you'd have to reset your checkout to a commit from before this happened and pull, but I'm not sure when this happened.
A command that would be way overkill (but would work) is this:

Code: Select all

git reset --hard 1.10.0 && git pull

(this may redownload a couple hundred MiB)

[Luther]

My clone is only about 2 weeks old. (My computer is new.) I used it to install 1.10.7.

Per your advice, I used the following commands:

Code: Select all

git reset --hard 1.10.7
git pull

Thankfully, I did get a successful checkout from this, but at the end of the 'git pull' output, I got this message:

Code: Select all

You are not currently on a branch, so I cannot use any
'branch.<branchname>.merge' in your configuration file.
Please specify which branch you want to merge with on the command
line and try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details.

git always seems to want to put me in a detached HEAD state. Does anyone know why git does this? I would expect git to disallow a detached HEAD because it prevents many operations from behaving in a sane manner.

[8680]

Code: Select all

$ git fetch origin 1.11.10
From https://github.com/wesnoth/wesnoth-old
 * tag               1.11.10    -> FETCH_HEAD
$ git checkout 1.11.10
error: pathspec '1.11.10' did not match any file(s) known to git.

If I’m reading the man-page correctly, git fetch origin 1.11.10 merges 1.11.10 into the current branch but doesn’t save it in .git/refs.

If it’s not saved in .git/refs, then git checkout 1.11.10 would fail, because there would be no ref named 1.11.10 to check out.

The correct way to do this would have been git fetch origin; git checkout 1.11.10. Assuming that there’s a local branch tracking origin/master, git fetch origin would fetch all tags on that branch along with the branch itself.

You can re-attach your HEAD by checking out a branch, e.g.: git checkout master.

[AI]

1.10.7 is on the 1.10 branch, while 1.11.10 is on the master branch. I'm curious what your repository currently looks like.

Can you do:

Code: Select all

git branch
git describe --tags
git checkout master
git describe --tags

This will tell you which branch you are on and what the most recent tag on that branch is, check out master and then tell you what the most recent tag on master is.

[Luther]

I'm doing this without first pulling for 1.11.11:

Code: Select all

$ git branch
* (no branch)
  master
$ git describe --tags
1.11.10
$ git checkout master
Checking out files: 100% (1268/1268), done.
Previous HEAD position was ce43713... another pot-update, just to be sure
Switched to branch 'master'
Your branch is behind 'origin/master' by 321 commits, and can be fast-forwarded.
$ git describe --tags
1.11.9-94-gb0950f0

[AI]

Well, if you pull now, you can check out 1.11.10-retag if you want to, but 1.11.10 has a rather important bug, so you should really get 1.11.11 instead.

It looks like you had 1.11.10, but hadn't merged FETCH_HEAD into master for some reason. (which is a complicated way of saying, you fetched, but didn't pull)

[Luther]

Well, if you pull now, you can check out 1.11.10-retag if you want to, but 1.11.10 has a rather important bug, so you should really get 1.11.11 instead.

Done.

It looks like you had 1.11.10, but hadn't merged FETCH_HEAD into master for some reason. (which is a complicated way of saying, you fetched, but didn't pull)

Yes. Git had tried to do a merge, but failed. The output was too complex for me to understand. A 'git diff' showed very large chunks from many files. A hard reset (as mentioned earlier in this thread) mostly fixed this problem.

Also, my checkout of 1.11.11 has again left me in a detached HEAD state. It's frustrating that git does not automatically put me on a branch. It's hard to believe that git has such an obvious bug, but it's equally hard to believe that no one can explain why git does this.