Merge branch 'jk/send-email-sender-prompt'

diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index c3555332366d687d04bfbc031b1be808f3caa802..1de0ebda25c1034fc1b343a8f0e3da9c2c7f8c6e 100755 (executable)
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -68,24 +68,24 @@ test_expect_success 'rebase against master' '
 
 test_expect_success 'rebase against master twice' '
        git rebase master >out &&
-       grep "Current branch my-topic-branch is up to date" out
+       test_i18ngrep "Current branch my-topic-branch is up to date" out
 '
 
 test_expect_success 'rebase against master twice with --force' '
        git rebase --force-rebase master >out &&
-       grep "Current branch my-topic-branch is up to date, rebase forced" out
+       test_i18ngrep "Current branch my-topic-branch is up to date, rebase forced" out
 '
 
 test_expect_success 'rebase against master twice from another branch' '
        git checkout my-topic-branch^ &&
        git rebase master my-topic-branch >out &&
-       grep "Current branch my-topic-branch is up to date" out
+       test_i18ngrep "Current branch my-topic-branch is up to date" out
 '
 
 test_expect_success 'rebase fast-forward to master' '
        git checkout my-topic-branch^ &&
        git rebase my-topic-branch >out &&
-       grep "Fast-forwarded HEAD to my-topic-branch" out
+       test_i18ngrep "Fast-forwarded HEAD to my-topic-branch" out
 '
 
 test_expect_success 'the rebase operation should not have destroyed author information' '
@@ -160,14 +160,12 @@ rm -f B
 
 test_expect_success 'fail when upstream arg is missing and not on branch' '
        git checkout topic &&
-       test_must_fail git rebase >output.out &&
-       grep "You are not currently on a branch" output.out
+       test_must_fail git rebase
 '
 
 test_expect_success 'fail when upstream arg is missing and not configured' '
        git checkout -b no-config topic &&
-       test_must_fail git rebase >output.out &&
-       grep "branch.no-config.merge" output.out
+       test_must_fail git rebase
 '
 
 test_expect_success 'default to @{upstream} when upstream arg is missing' '
@@ -218,4 +216,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