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

Fixes #174: Compatibility with older Git versions. #175

Merged
merged 2 commits into from Dec 7, 2017

Conversation

Projects
None yet
4 participants
@danepowell
Contributor

danepowell commented Dec 1, 2017

I'm still testing this locally but wanted to get this out so we could start review.

The first commit is the only functional change: adding a conditional to only use git apply on git repos.

The second commit is a refactor to encapsulate this functionality and make it a little cleaner to edit in the future.

@danepowell

This comment has been minimized.

Show comment
Hide comment
@danepowell

danepowell Dec 1, 2017

Contributor

I've confirmed that this works with both Git 2.1.4 and Git 2.14.1, the oldest and newest releases that you'll typically see in the wild.

@cweagans if this looks good to you and you can merge it, I'll try to test the dev branch in more places, and then maybe we can tag a new release

Contributor

danepowell commented Dec 1, 2017

I've confirmed that this works with both Git 2.1.4 and Git 2.14.1, the oldest and newest releases that you'll typically see in the wild.

@cweagans if this looks good to you and you can merge it, I'll try to test the dev branch in more places, and then maybe we can tag a new release

@danepowell

This comment has been minimized.

Show comment
Hide comment
@danepowell

danepowell Dec 5, 2017

Contributor

@cweagans I've tested and verified this fix in all of our environments that were failing with 1.6.3. Would you mind merging and tagging a new release? Judging by the comments in #174, this is biting a whole lot of people.

Contributor

danepowell commented Dec 5, 2017

@cweagans I've tested and verified this fix in all of our environments that were failing with 1.6.3. Would you mind merging and tagging a new release? Judging by the comments in #174, this is biting a whole lot of people.

@benjaminrau

This comment has been minimized.

Show comment
Hide comment
@benjaminrau

benjaminrau Dec 5, 2017

@cweagans @danepowell One should check github issues first, then debug issues oneself ;)
I debugged my scrutinizer build for few hours now... finally i solved it by just requiring this patch.

Read: Tested it right now and it works fine!

benjaminrau commented Dec 5, 2017

@cweagans @danepowell One should check github issues first, then debug issues oneself ;)
I debugged my scrutinizer build for few hours now... finally i solved it by just requiring this patch.

Read: Tested it right now and it works fine!

@pwolanin

This comment has been minimized.

Show comment
Hide comment
@pwolanin

pwolanin Dec 7, 2017

Thanks, this fixed the issue for me with git version 2.7.4.

under the covers it's falling back to the patch command with this change

pwolanin commented Dec 7, 2017

Thanks, this fixed the issue for me with git version 2.7.4.

under the covers it's falling back to the patch command with this change

@cweagans cweagans merged commit 462e650 into cweagans:1.x Dec 7, 2017

@cweagans

This comment has been minimized.

Show comment
Hide comment
@cweagans

cweagans Dec 7, 2017

Owner

Sorry for the slowness here folks.

This all looks great. Will tag a release.

Owner

cweagans commented Dec 7, 2017

Sorry for the slowness here folks.

This all looks great. Will tag a release.

lhridley added a commit to promet/composer-patches that referenced this pull request Apr 6, 2018

Merge pull request cweagans#175 from danepowell/issue-174
Fixes cweagans#174: Compatibility with older Git versions.

Modifying source to promet/composer-patches, adding a var_dump(); die
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment