mirror of
https://github.com/git/git.git
synced 2024-11-07 09:43:00 +01:00
9180feafbc
In9765b6a(rebase: align variable content, 2011-02-06), the code to error out was moved up one level. Unfortunately, one reference to a function parameter wasn't rewritten as it should, leading to the wrong parameter being errored on. This error was propagated by71786f5(rebase: factor out reference parsing, 2011-02-06) and merged in78c6e0f(Merge branch 'mz/rebase', 2011-04-28). Correct this by reporting $onto_name istead. Reported-By: Manuela Hutter <manuelah@opera.com> Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
70 lines
1.4 KiB
Bash
Executable file
70 lines
1.4 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='messages from rebase operation'
|
|
|
|
. ./test-lib.sh
|
|
|
|
quick_one () {
|
|
echo "$1" >"file$1" &&
|
|
git add "file$1" &&
|
|
test_tick &&
|
|
git commit -m "$1"
|
|
}
|
|
|
|
test_expect_success setup '
|
|
quick_one O &&
|
|
git branch topic &&
|
|
quick_one X &&
|
|
quick_one A &&
|
|
quick_one B &&
|
|
quick_one Y &&
|
|
|
|
git checkout topic &&
|
|
quick_one A &&
|
|
quick_one B &&
|
|
quick_one Z &&
|
|
git tag start
|
|
|
|
'
|
|
|
|
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 &&
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
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
|
|
'
|
|
|
|
test_expect_success 'rebase --onto outputs the invalid ref' '
|
|
test_must_fail git rebase --onto invalid-ref HEAD HEAD 2>err &&
|
|
grep "invalid-ref" err
|
|
'
|
|
|
|
test_done
|