diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-30 13:03:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-30 13:04:18 -0700 |
| commit | 80ffb7570f86fb8b671048a374f3c7990c45a27f (patch) | |
| tree | 0dcefafb4f8df01ccf1aaa3c345541b22d5dc1df /git-filter-branch.sh | |
| parent | Git 1.7.11.3 (diff) | |
| parent | t7003: add test to filter a branch with a commit at epoch (diff) | |
| download | git-80ffb7570f86fb8b671048a374f3c7990c45a27f.tar.gz git-80ffb7570f86fb8b671048a374f3c7990c45a27f.zip | |
Merge branch 'jc/maint-filter-branch-epoch-date' into maint
In 1.7.9 era, we taught "git rebase" about the raw timestamp format
but we did not teach the same trick to "filter-branch", which rolled
a similar logic on its own.
* jc/maint-filter-branch-epoch-date:
t7003: add test to filter a branch with a commit at epoch
date.c: Fix off by one error in object-header date parsing
filter-branch: do not forget the '@' prefix to force git-timestamp
Diffstat (limited to 'git-filter-branch.sh')
| -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 add2c0247f..178e45305d 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 |