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

Prefer to only use 'git describe' for all required info #156

Merged
merged 1 commit into from
Feb 24, 2017
Merged

Prefer to only use 'git describe' for all required info #156

merged 1 commit into from
Feb 24, 2017

Conversation

sschuberth
Copy link
Contributor

Previously, three git commands were used to gather all required info.
Now all info is gathered from a single 'git describe' call and only if
that fails fallbacks are used.

There already was the --dirty option before commit 929a5d7, but no
reason was given why it was removed.

@RonnyPfannschmidt
Copy link
Contributor

the reason was #86 - as git describe is failing with no tags present or no commits present

@sschuberth
Copy link
Contributor Author

Ok, but in that case the fallback should kick in, and all is good, or?

@RonnyPfannschmidt
Copy link
Contributor

@sschuberth yes, i just finished crosschecking, and your adaption is more nice as its faster in all usually relevant cases

@RonnyPfannschmidt
Copy link
Contributor

@sschuberth please add a change-log entry, then i can merge, good work 👍

@sschuberth
Copy link
Contributor Author

For which version? 1.15.1 still?

@RonnyPfannschmidt
Copy link
Contributor

yup

Previously, three git commands were used to gather all required info.
Now all info is gathered from a single 'git describe' call in all usual
cases, and only if that fails fallbacks are used.

The --dirty option was already present before commit 929a5d7, but it was
removed to address [1], which turns out to not actually be necessary as
we can try "git describe --dirty" first and then eventually use the
fallback.

[1] #86
@RonnyPfannschmidt RonnyPfannschmidt merged commit a3d8d09 into pypa:master Feb 24, 2017
@sschuberth sschuberth deleted the prefer-git-describe branch February 24, 2017 21:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants