2007-09-01 15:25:27 +08:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='messages from rebase operation'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
2013-06-07 14:11:42 +08:00
|
|
|
test_expect_success 'setup' '
|
|
|
|
test_commit O fileO &&
|
|
|
|
test_commit X fileX &&
|
|
|
|
test_commit A fileA &&
|
|
|
|
test_commit B fileB &&
|
|
|
|
test_commit Y fileY &&
|
2007-09-01 15:25:27 +08:00
|
|
|
|
2013-06-07 14:11:42 +08:00
|
|
|
git checkout -b topic O &&
|
|
|
|
git cherry-pick A B &&
|
|
|
|
test_commit Z fileZ &&
|
2009-03-02 06:11:38 +08:00
|
|
|
git tag start
|
2007-09-01 15:25:27 +08:00
|
|
|
'
|
|
|
|
|
|
|
|
cat >expect <<\EOF
|
|
|
|
Already applied: 0001 A
|
|
|
|
Already applied: 0002 B
|
|
|
|
Committed: 0003 Z
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'rebase -m' '
|
|
|
|
git rebase -m master >report &&
|
|
|
|
sed -n -e "/^Already applied: /p" \
|
|
|
|
-e "/^Committed: /p" report >actual &&
|
2008-03-13 05:36:36 +08:00
|
|
|
test_cmp expect actual
|
2007-09-01 15:25:27 +08:00
|
|
|
'
|
|
|
|
|
2013-06-07 14:11:43 +08:00
|
|
|
test_expect_success 'rebase against master twice' '
|
|
|
|
git rebase 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 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 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 topic >out &&
|
|
|
|
test_i18ngrep "Fast-forwarded HEAD to topic" out
|
|
|
|
'
|
|
|
|
|
2009-03-02 06:11:38 +08:00
|
|
|
test_expect_success 'rebase --stat' '
|
2010-10-31 09:46:54 +08:00
|
|
|
git reset --hard start &&
|
2009-03-02 06:11:38 +08:00
|
|
|
git rebase --stat master >diffstat.txt &&
|
|
|
|
grep "^ fileX | *1 +$" diffstat.txt
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'rebase w/config rebase.stat' '
|
2010-10-31 09:46:54 +08:00
|
|
|
git reset --hard start &&
|
2009-03-02 06:11:38 +08:00
|
|
|
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' '
|
2010-10-31 09:46:54 +08:00
|
|
|
git reset --hard start &&
|
2009-03-02 06:11:38 +08:00
|
|
|
git config rebase.stat true &&
|
|
|
|
git rebase -n master >diffstat.txt &&
|
|
|
|
! grep "^ fileX | *1 +$" diffstat.txt
|
|
|
|
'
|
|
|
|
|
2012-07-25 22:53:08 +08:00
|
|
|
# Output to stderr:
|
|
|
|
#
|
|
|
|
# "Does not point to a valid commit: invalid-ref"
|
|
|
|
#
|
|
|
|
# NEEDSWORK: This "grep" is fine in real non-C locales, but
|
|
|
|
# GETTEXT_POISON poisons the refname along with the enclosing
|
|
|
|
# error message.
|
2012-05-31 00:39:42 +08:00
|
|
|
test_expect_success 'rebase --onto outputs the invalid ref' '
|
|
|
|
test_must_fail git rebase --onto invalid-ref HEAD HEAD 2>err &&
|
2012-07-25 22:53:08 +08:00
|
|
|
test_i18ngrep "invalid-ref" err
|
2012-05-31 00:39:42 +08:00
|
|
|
'
|
|
|
|
|
2007-09-01 15:25:27 +08:00
|
|
|
test_done
|