hooks/post-receive @@ -33,7 +33,7 @@ Setup the configuration, see *spec/config_spec* for an example configuration dir In the git repository that you push on : - cp host/post-receive.rb (.git/)hooks/post-receive + cp host/post-receive (.git/)hooks/post-receive chmod +x (.git/)hooks/post-receive edit (.git/)hooks/post-receive README.mdown @@ -15,11 +15,15 @@ module Lighthouse::GitHooks attr_reader :real_tickets AUTHORIZED_KEYS = [ 'assign', 'state', 'tags', 'untag'] - + def initialize(old_rev, new_rev, ref=nil) super() @ref = ref - @commits = @repo.commits_between(old_rev, new_rev) + + # suppress merge replay + # git rev-list --first-parent commit1 commit2 + @commits = Grit::Commit.find_all @repo, "#{old_rev}..#{new_rev}", :first_parent => true + @message = "" @changes = [] end lib/lighthouse/git_hooks/ticket_updater.rb hooks/post-receive.rb 2adf67905436e49e2033b1aeb9c42890430a06a4 Antonin Amand gwik@gwikzone.org http://github.com/gwik/lighthouse-git-hooks/commit/2dd3addff6a24981df7d8a77b3dd2de11deee751 2dd3addff6a24981df7d8a77b3dd2de11deee751 2008-07-07T11:10:00-07:00 2008-07-07T11:10:00-07:00 move 047619e2d651c46c9b94fe478c49005be4796d01 Antonin Amand gwik@gwikzone.org