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

Check for git-tracker in hook before calling it #21

Merged
merged 3 commits into from
Jan 21, 2017
Merged

Check for git-tracker in hook before calling it #21

merged 3 commits into from
Jan 21, 2017

Conversation

flats
Copy link
Contributor

@flats flats commented Jan 4, 2017

git_tracker makes some GUI git clients (e.g. GitHub Desktop) unable to commit. This allows those clients to commit once again by checking for the existence of git-tracker before calling it in the hook.

Also specifies an older version of json for Ruby < 2, which I needed to do in order to pass CI.

Please let me know if you need any additional tests written for this.

flats added 2 commits January 4, 2017 16:13
git-tracker makes some GUI git clients unable to commit. This allows those clients to commit once again by checking for the existence of git-tracker before calling it in the hook.
@stevenharman
Copy link
Owner

Thanks, @flats. I hope to have a little time this coming week to catch up on PRs and issues across my OSS projects. With luck, we can get this fixed and shipped!

@stevenharman
Copy link
Owner

@flats I'm not opposed to this, but I wonder if it's a PATH issue with the GUI client? Perhaps similar to #20?

@stevenharman
Copy link
Owner

Heads up, @flats, I updated the supported versions of Ruby, which impacted some of your changes. I've already cleaned up the merge conflicts, but you'll need to pull them down locally if you're going to make any further changes.

@flats
Copy link
Contributor Author

flats commented Jan 21, 2017

@stevenharman, thanks! My apologies for the delay.

It could well be something like that - GitHub Desktop displays a load such file -- pre-commit error. It's a pretty bare-bones client, and there's no way that I can find to configure something like the PATH given the limited settings.

I occasionally use a GUI client, I've had to manually edit the git hook in all of my active local repos in order to avoid this issue. I spoke with a co-worker who mentioned having this same problem with a different git client, though I can't recall which one at the moment.

Anyway, obviously up to you, but I can say that it would at least be helpful to me. I don't think this needs any additional changes.

@stevenharman stevenharman merged commit d6a1f40 into stevenharman:master Jan 21, 2017
@stevenharman
Copy link
Owner

Merged. I also released git_tracker v2.0.0 to Rubygems: https://rubygems.org/gems/git_tracker. A new PR has also been opened to Homebrew, so the package should be updated 🔜. Thanks for the help, @flats!

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.

2 participants