diff options
Diffstat (limited to 'third_party/git/t/t3406-rebase-message.sh')
-rwxr-xr-x | third_party/git/t/t3406-rebase-message.sh | 122 |
1 files changed, 0 insertions, 122 deletions
diff --git a/third_party/git/t/t3406-rebase-message.sh b/third_party/git/t/t3406-rebase-message.sh deleted file mode 100755 index 927a4f4a4e4a..000000000000 --- a/third_party/git/t/t3406-rebase-message.sh +++ /dev/null @@ -1,122 +0,0 @@ -#!/bin/sh - -test_description='messages from rebase operation' - -. ./test-lib.sh - -test_expect_success 'setup' ' - test_commit O fileO && - test_commit X fileX && - test_commit A fileA && - test_commit B fileB && - test_commit Y fileY && - - git checkout -b topic O && - git cherry-pick A B && - test_commit Z fileZ && - git tag start -' - -test_expect_success 'rebase -m' ' - git rebase -m master >actual && - test_must_be_empty actual -' - -test_expect_success 'rebase against master twice' ' - git rebase --apply master >out && - test_i18ngrep "Current branch topic is up to date" out -' - -test_expect_success 'rebase against master twice with --force' ' - git rebase --force-rebase --apply master >out && - test_i18ngrep "Current branch topic is up to date, rebase forced" out -' - -test_expect_success 'rebase against master twice from another branch' ' - git checkout topic^ && - git rebase --apply master topic >out && - test_i18ngrep "Current branch topic is up to date" out -' - -test_expect_success 'rebase fast-forward to master' ' - git checkout topic^ && - git rebase --apply topic >out && - test_i18ngrep "Fast-forwarded HEAD to topic" out -' - -test_expect_success 'rebase --stat' ' - git reset --hard start && - git rebase --stat master >diffstat.txt && - grep "^ fileX | *1 +$" diffstat.txt -' - -test_expect_success 'rebase w/config rebase.stat' ' - git reset --hard start && - git config rebase.stat true && - git rebase master >diffstat.txt && - grep "^ fileX | *1 +$" diffstat.txt -' - -test_expect_success 'rebase -n overrides config rebase.stat config' ' - git reset --hard start && - git config rebase.stat true && - git rebase -n master >diffstat.txt && - ! grep "^ fileX | *1 +$" diffstat.txt -' - -# Output to stderr: -# -# "Does not point to a valid commit: invalid-ref" -# -# NEEDSWORK: This "grep" is fine in real non-C locales, but -# GIT_TEST_GETTEXT_POISON poisons the refname along with the enclosing -# error message. -test_expect_success 'rebase --onto outputs the invalid ref' ' - test_must_fail git rebase --onto invalid-ref HEAD HEAD 2>err && - test_i18ngrep "invalid-ref" err -' - -test_expect_success 'error out early upon -C<n> or --whitespace=<bad>' ' - test_must_fail git rebase -Cnot-a-number HEAD 2>err && - test_i18ngrep "numerical value" err && - test_must_fail git rebase --whitespace=bad HEAD 2>err && - test_i18ngrep "Invalid whitespace option" err -' - -test_expect_success 'GIT_REFLOG_ACTION' ' - git checkout start && - test_commit reflog-onto && - git checkout -b reflog-topic start && - test_commit reflog-to-rebase && - - git rebase reflog-onto && - git log -g --format=%gs -3 >actual && - cat >expect <<-\EOF && - rebase (finish): returning to refs/heads/reflog-topic - rebase (pick): reflog-to-rebase - rebase (start): checkout reflog-onto - EOF - test_cmp expect actual && - - git checkout -b reflog-prefix reflog-to-rebase && - GIT_REFLOG_ACTION=change-the-reflog git rebase reflog-onto && - git log -g --format=%gs -3 >actual && - cat >expect <<-\EOF && - change-the-reflog (finish): returning to refs/heads/reflog-prefix - change-the-reflog (pick): reflog-to-rebase - change-the-reflog (start): checkout reflog-onto - EOF - test_cmp expect actual -' - -test_expect_success 'rebase -i onto unrelated history' ' - git init unrelated && - test_commit -C unrelated 1 && - git -C unrelated remote add -f origin "$PWD" && - git -C unrelated branch --set-upstream-to=origin/master && - git -C unrelated -c core.editor=true rebase -i -v --stat >actual && - test_i18ngrep "Changes to " actual && - test_i18ngrep "5 files changed" actual -' - -test_done |