summaryrefslogtreecommitdiff
path: root/examples
AgeCommit message (Collapse)Author
2022-05-24Use format 1 without mtime in the example hooksAdam Spragg
2022-05-24Add post-merge git hook.Adam Spragg
It's the same as the post-checkout hook, doing the same job. I thought about symlinking instead of copying, but something doesn't sit quite right about that.
2022-05-24Make example hook shell scripts executableAdam Spragg
2022-05-24Abort commits during conflicts if differences existAdam Spragg
If the user is running `git commit` to resolve a conflict, it's dangerous to just save the metadata from the filesystem. It's possible that they just fixed a conflict in the metadata file, but didn't update the on-disk metadata to match. (I know it's possible, because I did this!) Our normal mode of operation, of just saving the metadata during a commit to match whatever's on-disk, would wipe out their careful conflict resolution! (On the other hand, just overwriting the on-disk metadata might not be the best idea either.) But the point of a conflict is that the changes between two different branches *can't* be resolved automatically, and requires manual intervention. Given that situation, asking them to resolve the difference manually seems to be the most obvious option.
2016-01-19examples/hooks/pre-commit: Improve handling of first metastore commit.Przemyslaw Pawelczyk
Previously after first metastore commit, metastore -c would show ./.metadata: added which was misleading. Now metastore -s is run twice if .metadata is not in repository yet.
2016-01-19examples/git-metapull: Apply stored metadata with -e -E options.Przemyslaw Pawelczyk
2016-01-19examples/git-metapull: Fix the comments.Przemyslaw Pawelczyk
2016-01-19examples/hooks/pre-commit: Add warning in comments re aborted commit.Przemyslaw Pawelczyk
Fixes #26.
2016-01-19examples/git-metapull: Fix the script.Przemyslaw Pawelczyk
2016-01-19examples: Move hook scripts to their own subdirectory.Przemyslaw Pawelczyk
2015-09-02examples: Add post-checkout example script.Dan Fandrich
This is analagous script to the pre-commit one, but it applies metadata automatically after a git checkout. Signed-off-by: Przemyslaw Pawelczyk <przemoc@gmail.com>
2015-09-01examples: Use /bin/sh as the shell for scripts (instead of bash).Dan Fandrich
Scripts seem to be POSIX shell conformant, so no need to be specific. Signed-off-by: Przemyslaw Pawelczyk <przemoc@gmail.com>
2015-02-14Improve example hooks and remove bashisms in them.Przemyslaw Pawelczyk
2012-02-10Remove prompting from example Git pre-commit hook.Romain Francoise
Hooks now run with stdin closed (since Git version 1.5.4) and prompting will not work when using a high-level interface such as git-gui or Emacs anyway.
2007-05-20Add example scripts to integrate metastore with gitDavid Härdeman