#2209 Hook should be okay with merge commits that aren't signed off

v1.0.0
closed
Wolf
sf-1 (616)
Other
nobody
2015-08-20
2011-06-02
Dave Brondsema
No 
:::text
Dave
Wolf: what would it take to tweak our hook so that merge commits don't have to be signed off?
2:20
Wolf
I'm not sure, I'd have to count the parents I guess.  that probably wouldn't be too hard
would you want the same for reverts?
2:21
Dave
or if the message starts with 'merge' 
probably
2:21
Wolf
well… you can totally control the message of a merge commit, and you might not start it that way
2:21
Dave
yeah
--amend worked fine to fix it up, but would be nice if things "just worked"
2:22
Wolf
but counting parents seems pretty foolproof

Discussion

  • Wolf - 2011-06-06
    • status: open --> in-progress
    • assigned_to: Wolf
     

  • Wolf - 2011-06-06
    • status: in-progress --> closed
    • size: --> 1

    • milestone: limbo --> jun-03

    • Description has changed:

    Diff:

    --- old 
+++ new 
@@ -1,4 +1,5 @@
 ~~~~
+:::text
 Dave
 Wolf: what would it take to tweak our hook so that merge commits don't have to be signed off?
 2:20
     

Log in to post a comment.