[Scummvm-devel] Merged branch-1-3-0 into master

[Marcus Comstedt]

Max Horn <max at quendi.de> writes:

> We should then still think a little bit about how we handle "tagging" of the final release, esp. since in the past we had to re-tag very often, and that's not so easily done with git, I understand (because once you made a tag public, you don't really want to change it anymore. nor can you, really, right?!?)


By default, existing tags are not moved by fetch/pull.  But if you
give the flag "--tags", then you'll pick up moved tags.  It's possible
to make this the default by setting the config "remote.XXX.tagopt" to
"--tags".

Alternatives to moving a public tag could be

* Don't actually push the tag to github until it's certain which
  commit the final release will be based on (i.e. after the release
  has been made)

* Use distinct tag names for each "retag", e.g. add _rc1, _rc2 etc to
  the end.  When the end result is done, a final tag pointing to
  the last _rcN can be created.


  // Marcus