Age | Commit message (Collapse) | Author | |
---|---|---|---|
2022-05-24 | Use format 1 without mtime in the example hooks | Adam Spragg | |
2022-05-24 | Add 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-24 | Make example hook shell scripts executable | Adam Spragg | |
2022-05-24 | Abort commits during conflicts if differences exist | Adam 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-19 | examples/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-19 | examples/hooks/pre-commit: Add warning in comments re aborted commit. | Przemyslaw Pawelczyk | |
Fixes #26. | |||
2016-01-19 | examples: Move hook scripts to their own subdirectory. | Przemyslaw Pawelczyk | |