Skip to content

Commit

Permalink
Don't repeat version number when built from Git
Browse files Browse the repository at this point in the history
When Andreas Krennmair did Newsbeuter releases, he forked master branch,
generated documentation and put a tag on the result. This meant that
when git-describe was run in master, it didn't consider the tags as they
aren't part of master branch.

I do releases differently; I tag a commit in master, and release that.
But now git-describe sees those tags and includes them in result. Since
config.h prepends current version to that result, we were getting
oddities like "2.10.1-2.10.1-58-aabbcc".
  • Loading branch information
Minoru committed Oct 14, 2017
1 parent f67cf9e commit a910cb6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion config.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#define REAL_VERSION "2.10.1"

#ifdef GIT_HASH
#define PROGRAM_VERSION REAL_VERSION "-" GIT_HASH
#define PROGRAM_VERSION GIT_HASH
#else
#define PROGRAM_VERSION REAL_VERSION
#endif
Expand Down

0 comments on commit a910cb6

Please sign in to comment.