#47967: gitrev is wrong in freeciv-server -v
Open Date: 2023-04-29 23:58
Last Update: 2023-04-30 20:52
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-04-30 20:52 Updated by: alain_bkr
Comment:
Reply To cazfi
Reply To (Anonymous)
add "+ modified" if there are uncommited local changes
- There's a regression that "+ modified" does not get translated
OK i 'll remove the + and use translate
(in general: is there some reason how you split the information between REV1 and REV2?)
yes,
it was split REV1/REV2
The REV2 gives the same hash as before the patch.
- Need to update comments in fc_gitrev_gen.h.tmpl to match (and I notice that translatability of "modified " was something already missing from there)
done, i attach the corrresponding patch
- I have not yet checked if such a long string makes sense for all freeciv_name_version() and fc_git_revision() callers, but I suspect some adjustments are needed for latter at least
It just works for the displayed version in GUI or command line, these are strings anyways, just longer ones.
---------------------------------------------------------------------
Ticket Status:
Reporter: alain_bkr
Owner: (None)
Type: Bugs
Status: Open
Priority: 7
MileStone: (None)
Component: General
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