diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-07-22 12:54:08 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-07-22 12:55:05 -0700 |
commit | 9a0231b395cb9720365b7066312eeaa86e37ed31 (patch) | |
tree | c0bbb57aeb5653275e237f72f1da25599e29056c /date.c | |
parent | 31c79549b85c6393be4f40432f5b86ebc097fc7e (diff) | |
parent | 44b85e89d70da5ee7fc688d4a9c021f6a419b363 (diff) | |
download | git-9a0231b395cb9720365b7066312eeaa86e37ed31.tar.gz |
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 'date.c')
-rw-r--r-- | date.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -624,7 +624,7 @@ static int match_object_header_date(const char *date, unsigned long *timestamp, unsigned long stamp; int ofs; - if (*date < '0' || '9' <= *date) + if (*date < '0' || '9' < *date) return -1; stamp = strtoul(date, &end, 10); if (*end != ' ' || stamp == ULONG_MAX || (end[1] != '+' && end[1] != '-')) |