diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-06-02 23:35:05 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-06-02 23:35:05 +0300 |
| commit | 54041832d7d2a20c26bdf8eeb8aeb475024ef8d5 (patch) | |
| tree | 1dda599db11cbf7dd4b1623bb14a7290cb71bf15 /t | |
| parent | a0ba2bbbdd9c5b44ae49910bc774aced87f89771 (diff) | |
| parent | d42a2fb72f8cbe6efd60a4f90c8e9ec1c888c3a7 (diff) | |
Merge branch 'en/fast-import-looser-date'
Some repositories in the wild have commits that record nonsense
committer timezone (e.g. rails.git); "git fast-import" learned an
option to pass these nonsense timestamps intact to allow recreating
existing repositories as-is.
* en/fast-import-looser-date:
fast-import: add new --date-format=raw-permissive format
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9300-fast-import.sh | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 768257b29e..e151df81c0 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -410,6 +410,34 @@ test_expect_success 'B: accept empty committer' ' test -z "$out" ' +test_expect_success 'B: reject invalid timezone' ' + cat >input <<-INPUT_END && + commit refs/heads/invalid-timezone + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1234567890 +051800 + data <<COMMIT + empty commit + COMMIT + INPUT_END + + test_when_finished "git update-ref -d refs/heads/invalid-timezone" && + test_must_fail git fast-import <input +' + +test_expect_success 'B: accept invalid timezone with raw-permissive' ' + cat >input <<-INPUT_END && + commit refs/heads/invalid-timezone + committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1234567890 +051800 + data <<COMMIT + empty commit + COMMIT + INPUT_END + + git init invalid-timezone && + git -C invalid-timezone fast-import --date-format=raw-permissive <input && + git -C invalid-timezone cat-file -p invalid-timezone >out && + grep "1234567890 [+]051800" out +' + test_expect_success 'B: accept and fixup committer with no name' ' cat >input <<-INPUT_END && commit refs/heads/empty-committer-2 |