Merge branch 'jc/maint-filter-branch-epoch-date' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Jul 2012 20:03:40 +0000 (13:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Jul 2012 20:04:18 +0000 (13:04 -0700)
commit80ffb7570f86fb8b671048a374f3c7990c45a27f
tree0dcefafb4f8df01ccf1aaa3c345541b22d5dc1df
parente6dfbcf12b0e70897818cb36903de0625931a5c6
parent44b85e89d70da5ee7fc688d4a9c021f6a419b363
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
date.c
git-filter-branch.sh
t/test-lib-functions.sh