#47967: gitrev is wrong in freeciv-server -v
Open Date: 2023-04-30 00:58
Last Update: 2023-05-26 22:21
URL for this Ticket:
https://osdn.net//projects/freeciv/ticket/47967
RSS feed for this Ticket:
https://osdn.net/ticket/ticket_rss.php?group_id=12505&tid=47967
---------------------------------------------------------------------
Last Changes/Comment on this Ticket:
2023-05-26 22:21 Updated by: cazfi
* Owner Update from cazfi to (None)
Comment:
Reply To cazfi
Working on this, but it's taking a bit head scratching to figure out what you mean to happen, e.g., with local branches for which there's no similarly named branch on a remote named 'origin'
What I currently get in my work branch:
During build:
fc_gitrev_gen.h
fatal: ambiguous argument 'origin/main-work2': unknown revision or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git <command> [<revision>...] -- [<file>...]'
fatal: bad revision '^'
CC version.lo
Running, with no changes relative to latest commit on my tree:
$ ./fcser --version
Encodings: Data=UTF-8, Local=UTF-8, Internal=UTF-8
Freeciv version 3.2.90.3-dev (origin/main-work2 HEAD b9a62d6907 (+) )
Running, with changes relative to latest commit on my tree:
$ ./fcser --version
Encodings: Data=UTF-8, Local=UTF-8, Internal=UTF-8
Freeciv version 3.2.90.3-dev (origin/main-work2 HEAD b9a62d6907 (+) (modified))
---
I'd prefer to give this back to alain_bkr at this point.
---------------------------------------------------------------------
Ticket Status:
Reporter: alain_bkr
Owner: (None)
Type: Patches
Status: Open
Priority: 5 - Medium
MileStone: 3.0.8
Component: Bootstrap
Severity: 5 - Medium
Resolution: None
---------------------------------------------------------------------
Ticket details:
S3_1
The value return buy freeciv-server -v is an old reference (in example 164 commit behind origin/S3_1 pulled today)
$ LANG=en ./server/freeciv-server -v
Encodings: Data=UTF-8, Local=ISO-8859-1, Internal=UTF-8
Freeciv version 3.1.0-beta1+ (beta version) (modified 75200a454)
$ git log origin/S3_1...75200a454 | grep commit | wc -l
164
It seems that the values of bootstrap/generate_gitrev.sh -> ./common/fc_gitrev_gen.h are not taken into account and we have a fallback from somewhere.
--
Ticket information of Freeciv project
Freeciv Project is hosted on OSDN
Project URL: https://osdn.net/projects/freeciv/
OSDN: https://osdn.net
URL for this Ticket:
https://osdn.net/projects/freeciv/ticket/47967
RSS feed for this Ticket:
https://osdn.net/ticket/ticket_rss.php?group_id=12505&tid=47967