| commit | a1980c4efcfea516e2ba442bf7e56a39d9a7933f | |
| author | Anders Kaseorg <andersk@ksplice.com> | |
| Wed, 29 Sep 2010 20:49:49 +0000 (29 16:49 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Oct 2010 23:39:45 +0000 (13 16:39 -0700) | ||
| tree | a1f0bbfe13af6e7d36e76e53646337c4f7b94d07 | treesnapshot (tar.gz zip) |
| parent | 87b50542a08ac6caa083ddc376e674424e37940a | commitdiff |
apply: Recognize epoch timestamps with : in the timezone
Some patches have a timezone formatted like ‘-08:00’ instead of
‘-0800’ (e.g. http://lwn.net/Articles/131729/), so git apply would
fail to recognize the epoch timestamp of deleted files and would
create empty files instead. Teach it to support both formats, and add
a test case.
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Some patches have a timezone formatted like ‘-08:00’ instead of
‘-0800’ (e.g. http://lwn.net/Articles/131729/), so git apply would
fail to recognize the epoch timestamp of deleted files and would
create empty files instead. Teach it to support both formats, and add
a test case.
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/apply.c | diffblobblamehistory | |
| t/t4132-apply-removal.sh | diffblobblamehistory |