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

Audit CLI opts used in git states #31302

Merged
merged 1 commit into from Feb 18, 2016

Conversation

terminalmage
Copy link
Contributor

This restricts the git state module to git 1.6.5 or later, as some of
the core functionality needed for git.latest was not present before that
version. This release is over 6 years old now, so this change should be
safe to make.

In addition, this stops git.latest from trying to use the --ff-only
argument when running a git merge to fast-forward the repo, in versions
where this option is not available.

This restricts the git state module to git 1.6.5 or later, as some of
the core functionality needed for git.latest was not present before that
version. This release is over 6 years old now, so this change should be
safe to make.

In addition, this stops git.latest from trying to use the --ff-only
argument when running a git merge to fast-forward the repo, in versions
where this option is not available.
cachedout pushed a commit that referenced this pull request Feb 18, 2016
@cachedout cachedout merged commit 408d89e into saltstack:2015.8 Feb 18, 2016
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