From 3104ddb1ff31d3756011dfbde82036630fb3b0c7 Mon Sep 17 00:00:00 2001 From: "Bradley M. Kuhn" Date: Sun, 29 May 2011 17:31:59 -0400 Subject: [PATCH] Changed date to be same for commit and author; Fixed patch line regex. --- bash-patch-apply.plx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bash-patch-apply.plx b/bash-patch-apply.plx index 3700b8d..1ca3dba 100755 --- a/bash-patch-apply.plx +++ b/bash-patch-apply.plx @@ -37,7 +37,7 @@ foreach my $patchFile (@ARGV) { my($log, $takingLog, $inPatch, $date, undef) = ("", 0, 0); while (my $line = ) { $takingLog = 1 if ($line =~ /^Patch-ID\s*:/); - if ($line =~ /^\s*Patch\s*:\s*$/) { + if ($line =~ /^\s*Patch\s*(\([^\)]+\))?:\s*$/) { $takingLog = 0; $inPatch = 1; next; @@ -69,6 +69,7 @@ foreach my $patchFile (@ARGV) { exit 1; } $ENV{GIT_AUTHOR_DATE} = $date; + $ENV{GIT_COMMITTER_DATE} = $date; $ENV{GIT_AUTHOR_NAME} = 'Chet Ramey'; $ENV{GIT_AUTHOR_EMAIL} = 'chet@cwru.edu'; open(COMMIT, "|-", "git commit -a -F -") or die "unable to run git: $!";