Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Return special version if compiled on a branch != master #156

Merged
merged 3 commits into from
Nov 3, 2017

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Nov 3, 2017

By submitting this pull request, I confirm the following (please check boxes, eg [X]) Failure to fill the template will close your PR:

Please submit all pull requests against the development branch. Failure to do so will delay or deny your request

  • I have read and understood the contributors guide.
  • I have checked that another pull request for this purpose does not exist.
  • I have considered, and confirmed that this submission will be valuable to others.
  • I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  • I give this submission freely, and claim no ownership to its content.

How familiar are you with the codebase?:

10


On branch master:

$ pihole-FTL version
v2.9.1

on any other branch we use vDev:

$ pihole-FTL version
vDev-86d370e

This template was created based on the work of udemy-dl.

Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
args.c Outdated
@@ -55,7 +55,10 @@ void parse_args(int argc, char* argv[])

if(strcmp(argv[i], "version") == 0)
{
printf("%s\n",GIT_VERSION);
if(strcmp(GIT_TAG, "master") == 0)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be using GIT_BRANCH?

Signed-off-by: DL6ER <dl6er@dl6er.de>
@AzureMarker AzureMarker merged commit d2191c1 into development Nov 3, 2017
@AzureMarker AzureMarker deleted the tweak/vDev branch November 3, 2017 20:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants