From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 9 Jul 2012 23:53:34 +0000 (-0700)
Subject: filter-branch: do not forget the '@' prefix to force git-timestamp
X-Git-Tag: v1.7.12-rc0~23^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cb102b083252b575b18afa8d4b4a4b1bc1ffdf9e;p=git.git

filter-branch: do not forget the '@' prefix to force git-timestamp

For some reason, this script reinvents, instead of refactoring the
existing one in git-sh-setup, the logic to grab ident information
from an existing commit; it was missed when the corresponding logic
in git-sh-setup was updated with 2c733fb (parse_date(): '@' prefix
forces git-timestamp, 2012-02-02).

Teach the script that it is OK to have a way ancient timestamp in
the commits that are being filtered.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 804a7f4bc..b9cded5a2 100755
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -84,7 +84,7 @@ set_ident () {
 			s/.*/GIT_'$uid'_EMAIL='\''&'\''; export GIT_'$uid'_EMAIL/p
 
 			g
-			s/^'$lid' [^<]* <[^>]*> \(.*\)$/\1/
+			s/^'$lid' [^<]* <[^>]*> \(.*\)$/@\1/
 			s/'\''/'\''\'\'\''/g
 			s/.*/GIT_'$uid'_DATE='\''&'\''; export GIT_'$uid'_DATE/p