diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-22 19:54:08 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-22 19:55:05 (GMT) |
| commit | 9a0231b395cb9720365b7066312eeaa86e37ed31 (patch) | |
| tree | c0bbb57aeb5653275e237f72f1da25599e29056c /git-filter-branch.sh | |
| parent | 31c79549b85c6393be4f40432f5b86ebc097fc7e (diff) | |
| parent | 44b85e89d70da5ee7fc688d4a9c021f6a419b363 (diff) | |
| download | git-9a0231b395cb9720365b7066312eeaa86e37ed31.zip git-9a0231b395cb9720365b7066312eeaa86e37ed31.tar.gz git-9a0231b395cb9720365b7066312eeaa86e37ed31.tar.bz2 | |
Merge branch 'jc/maint-filter-branch-epoch-date'
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. Because of this, "filter-branch" failed
to rewrite commits with ancient timestamps.
* 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 add2c02..178e453 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 |