|
From: Ivo R. <iv...@iv...> - 2017-02-28 22:45:15
|
2017-02-28 23:13 GMT+01:00 Tom Hughes <to...@co...>: > On 28/02/17 20:56, Ivo Raisr wrote: > >> So we decided to stick with existing (SVN) workflow which translates to >> "rebased branches at the top of the tree". >> Our valgrind.git config will have (after the final migration happens): >> >> [receive] >> denyNonFastforwards = true > > > That doesn't actually prevent people pushing merges though, it just stops > history being rewritten - the push to the remote can only move the remote > forward but the pushed commits can include merges. Good point. So I think it's the time to start gathering config for AdaCore git hooks [1] [2] which is used at sourceware.org. ---------------------------------- [hooks] from-domain = sourceware.org mailinglist = val...@li... # Allow to include debugging output in commit messages. max-rh-line-length = 0 # Forces to rebase changes before pushing to master and release branches. reject-merge-commits = refs/heads/master, refs/heads/VALGRIND_.* commit-url = "https://sourceware.org/git/?p=valgrind.git;h=%(rev)s" # No emails from private user branches. no-emails = /refs/heads/user/.* ---------------------------------- Your thoughts? I. [1] https://github.com/adacore/git-hooks [2] https://sourceware.org/gdb/wiki/GitHooksUsersGuide |