{"thread":{"id":"30988","subject":"[PATCH] filter-branch: do not forget the '@' prefix to force git-timestamp","startedAt":"2012-07-09T23:56:17Z","lastAt":"2012-07-09T23:56:17Z","messageCount":1,"participants":["Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"194840","messageId":"7vobnoij4u.fsf@alter.siamese.dyndns.org","threadId":"30988","inReplyTo":null,"subject":"[PATCH] filter-branch: do not forget the '@' prefix to force git-timestamp","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-07-09T23:56:17Z","receivedAt":"2012-07-09T23:56:17Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"For some reason, this script reinvents, instead of refactoring the\nexisting one in git-sh-setup, in the ident logic, and it was missed\nwhen git-sh-setup was updated with 2c733fb (parse_date(): '@' prefix\nforces git-timestamp, 2012-02-02).\n\nTeach the script that it is OK to have a way ancient timestamp in\nthe commits that are being filtered.\n\nSigned-off-by: Junio C Hamano <gitster@pobox.com>\n---\n git-filter-branch.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/git-filter-branch.sh b/git-filter-branch.sh\nindex 804a7f4..b9cded5 100755\n--- a/git-filter-branch.sh\n+++ b/git-filter-branch.sh\n@@ -84,7 +84,7 @@ set_ident () {\n \t\t\ts/.*/GIT_'$uid'_EMAIL='\\''&'\\''; export GIT_'$uid'_EMAIL/p\n \n \t\t\tg\n-\t\t\ts/^'$lid' [^<]* <[^>]*> \\(.*\\)$/\\1/\n+\t\t\ts/^'$lid' [^<]* <[^>]*> \\(.*\\)$/@\\1/\n \t\t\ts/'\\''/'\\''\\'\\'\\''/g\n \t\t\ts/.*/GIT_'$uid'_DATE='\\''&'\\''; export GIT_'$uid'_DATE/p\n \n-- \n1.7.11.1.294.gf7b86df\n"}]}