From cebd1837e50a400e1580ce425a7ac824bbabd01d Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Wed, 3 Aug 2011 13:02:45 +0000 Subject: [PATCH] Add special token to gkcommit commit messages so that the SVN pre-commit hook doesn't try to re-close tickets that are referred to in the original SVN commit messages. This commit was SVN r24981. --- contrib/dist/gkcommit.pl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/dist/gkcommit.pl b/contrib/dist/gkcommit.pl index ede82e4f76..5d7ee5db05 100755 --- a/contrib/dist/gkcommit.pl +++ b/contrib/dist/gkcommit.pl @@ -238,7 +238,11 @@ foreach my $cmr (@cmrs) { } print FILE "\n"; -# If we have r numbers, print them +# If we have r numbers, print them. Use a special line to make the +# pre-commit hook ignore all of these messages (i.e., so that it +# doesn't try to close some ticket twice, or something like that). +print FILE "---svn-pre-commit-ignore-below---\n" + if ($#rs >= 0); foreach my $r (@rs) { print FILE "r$r $logentries->{$r}->{msg}\n\n";