johnkeeping / git-integration Goto Github PK

I really love this idea, but I don’t trust that I’ll always remember to use it properly. More importantly, in a collaboration-rich ecosystem like GitHub, there needs to be an automated way of alerting people that the repository they just cloned is using this thing called git-integration.

I propose the following hooks:

• Auto-update integration branch(es). This is just an ease-of-use feature. But there’s no reason not to include it! Rather than force people to run git integration --rebuild integration, this should be automated with a hook.

  When an integration branch is created, a message should alert the user about this hook, and tell them how to opt-out if they wish. (Given the purpose for git-integration’s existence, I suspect that most users will prefer the automated rebuild.)

• Prevent commits. Someone who isn’t familiar with git-integration may clone a repo and not realize that an integration branch is supposed to be a “pre-assembled” branch. A hook should prevent unsuspecting users from committing to an integration branch, only to discover that they wasted their time when they find out the integration branch’s intended purpose.

• Reminders. For newly-cloned repositories, it might be helpful if a hook printed out a message informing the user that this repository is using git-integration, along with a URL for them to learn more.

I made a Homebrew formula for git-integration. The Homebrew maintainer requested that I refer to a release tag rather than a commit hash. Would you mind adding a release tag, after merging #1 or an equivalent fix?

Hi, git-integration seems to have a problem with Git 1.7.10.4 on Debian 7.

When I create an integration sheet like this:

base master
merge topic-1
merge topic-2

I get the following error:

$ git integration --edit --rebuild
usage: git stripspace [-s | --strip-comments] < input
fatal: Not a valid object name -p
Failed to write instruction sheet commit

It's unclear to me how two repositories on different servers should share git-integration instructions so that each can use git integration --rebuild to produce the same resulting branch.