{"thread":{"id":"13601","subject":"[PATCH] Fix prepare-commit-msg hook and replace in-place sed","startedAt":"2008-05-21T16:25:54Z","lastAt":"2008-05-21T16:25:54Z","messageCount":1,"participants":["Marcel Koeppen"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"77396","messageId":"1211387154-8792-1-git-send-email-git-dev@marzelpan.de","threadId":"13601","inReplyTo":null,"subject":"[PATCH] Fix prepare-commit-msg hook and replace in-place sed","fromName":"Marcel Koeppen","fromEmail":"git-dev@marzelpan.de","sentAt":"2008-05-21T16:25:54Z","receivedAt":"2008-05-21T16:25:54Z","isPatch":true,"sender":{"key":"git-dev@marzelpan.de","avatar":"https://gravatar.com/avatar/73c4b29dc13b236d868ba2f40a10262caaf43c0e37d48c459ca07bf3176fa1ba?d=mp&s=160"},"body":"The patterns to the case statement could never be matched, so the hook\nwas a noop. This patch also replaces the non-portable use of in-place sed.\n\nSigned-off-by: Marcel Koeppen <git-dev@marzelpan.de>\n---\n templates/hooks--prepare-commit-msg |    8 ++++----\n 1 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/templates/hooks--prepare-commit-msg b/templates/hooks--prepare-commit-msg\nindex ff0f42a..d3c1da3 100644\n--- a/templates/hooks--prepare-commit-msg\n+++ b/templates/hooks--prepare-commit-msg\n@@ -20,11 +20,11 @@\n # The third example adds a Signed-off-by line to the message, that can\n # still be edited.  This is rarely a good idea.\n \n-case \"$2 $3\" in\n-  merge)\n-    sed -i '/^Conflicts:/,/#/!b;s/^/# &/;s/^# #/#/' \"$1\" ;;\n+case \"$2,$3\" in\n+  merge,)\n+    perl -i -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' \"$1\" ;;\n \n-# \"\"|template)\n+# ,|template,)\n #   perl -i -pe '\n #      print \"\\n\" . `git diff --cached --name-status -r`\n #\t if /^#/ && $first++ == 0' \"$1\" ;;\n-- \n1.5.5.1.316.g377d9\n"}]}