Skip to content

Commit cb102b0

Browse files
committed
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 <[email protected]>
1 parent 2c733fb commit cb102b0

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

git-filter-branch.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ set_ident () {
8484
s/.*/GIT_'$uid'_EMAIL='\''&'\''; export GIT_'$uid'_EMAIL/p
8585
8686
g
87-
s/^'$lid' [^<]* <[^>]*> \(.*\)$/\1/
87+
s/^'$lid' [^<]* <[^>]*> \(.*\)$/@\1/
8888
s/'\''/'\''\'\'\''/g
8989
s/.*/GIT_'$uid'_DATE='\''&'\''; export GIT_'$uid'_DATE/p
9090

0 commit comments

Comments
 (0)