diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-09 16:53:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-09 20:42:54 -0700 |
| commit | cb102b083252b575b18afa8d4b4a4b1bc1ffdf9e (patch) | |
| tree | f359c9671268f6753a8313b3fa0198fa2b4b1408 | |
| parent | 2c733fb24c10a9d7aacc51f956bf9b7881980870 (diff) | |
| download | git-cb102b083252b575b18afa8d4b4a4b1bc1ffdf9e.tar.gz git-cb102b083252b575b18afa8d4b4a4b1bc1ffdf9e.tar.xz | |
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>
| -rwxr-xr-x | git-filter-branch.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |