diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-02-13 11:42:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-13 11:42:15 -0800 |
| commit | 87cb3b82a42613dc3ffd1eddf95f8c306a045ad1 (patch) | |
| tree | 056bc067a0f6de58609373179d1795df07821627 /t | |
| parent | Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into maint (diff) | |
| parent | parse_date(): '@' prefix forces git-timestamp (diff) | |
| download | tgif-87cb3b82a42613dc3ffd1eddf95f8c306a045ad1.tar.xz | |
Merge branch 'jc/parse-date-raw' into maint
* jc/parse-date-raw:
parse_date(): '@' prefix forces git-timestamp
parse_date(): allow ancient git-timestamp
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3400-rebase.sh | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index c355533236..e647272a01 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -218,4 +218,27 @@ test_expect_success 'rebase -m can copy notes' ' test "a note" = "$(git notes show HEAD)" ' +test_expect_success 'rebase commit with an ancient timestamp' ' + git reset --hard && + + >old.one && git add old.one && test_tick && + git commit --date="@12345 +0400" -m "Old one" && + >old.two && git add old.two && test_tick && + git commit --date="@23456 +0500" -m "Old two" && + >old.three && git add old.three && test_tick && + git commit --date="@34567 +0600" -m "Old three" && + + git cat-file commit HEAD^^ >actual && + grep "author .* 12345 +0400$" actual && + git cat-file commit HEAD^ >actual && + grep "author .* 23456 +0500$" actual && + git cat-file commit HEAD >actual && + grep "author .* 34567 +0600$" actual && + + git rebase --onto HEAD^^ HEAD^ && + + git cat-file commit HEAD >actual && + grep "author .* 34567 +0600$" actual +' + test_done |