mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-30 22:07:53 +01:00
Code Activity

t3401: modernize style

Browse source 
Put the opening quote starting each test on the same line as the
test_expect_* invocation. Also make sure to use tabs for indentation.

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Martin von Zweigbergk 2011-12-09 08:59:11 -08:00 committed by Junio C Hamano
parent 5e11362271
commit f73e5ee566
1 changed files with 33 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
t/t3401-rebase-partial.sh
View file

@ -11,51 +11,50 @@ local branch.
'
. ./test-lib.sh
test_expect_success \
'prepare repository with topic branch' \
'echo First > A &&
git update-index --add A &&
git commit -m "Add A." &&
test_expect_success 'prepare repository with topic branch' '
echo First > A &&
git update-index --add A &&
git commit -m "Add A." &&
git checkout -b my-topic-branch &&
git checkout -b my-topic-branch &&
echo Second > B &&
git update-index --add B &&
git commit -m "Add B." &&
echo Second > B &&
git update-index --add B &&
git commit -m "Add B." &&
echo AnotherSecond > C &&
git update-index --add C &&
git commit -m "Add C." &&
echo AnotherSecond > C &&
git update-index --add C &&
git commit -m "Add C." &&
git checkout -f master &&
git checkout -f master &&
echo Third >> A &&
git update-index A &&
git commit -m "Modify A."
echo Third >> A &&
git update-index A &&
git commit -m "Modify A."
'
test_expect_success \
'pick top patch from topic branch into master' \
'git cherry-pick my-topic-branch^0 &&
git checkout -f my-topic-branch &&
git branch master-merge master &&
git branch my-topic-branch-merge my-topic-branch
test_expect_success 'pick top patch from topic branch into master' '
git cherry-pick my-topic-branch^0 &&
git checkout -f my-topic-branch &&
git branch master-merge master &&
git branch my-topic-branch-merge my-topic-branch
'
test_debug \
'git cherry master &&
git format-patch -k --stdout --full-index master >/dev/null &&
gitk --all & sleep 1
test_debug '
git cherry master &&
git format-patch -k --stdout --full-index master >/dev/null &&
gitk --all & sleep 1
'
test_expect_success \
'rebase topic branch against new master and check git am did not get halted' \
'git rebase master && test ! -d .git/rebase-apply'
test_expect_success 'rebase topic branch against new master and check git am did not get halted' '
git rebase master &&
test ! -d .git/rebase-apply
'
test_expect_success \
'rebase --merge topic branch that was partially merged upstream' \
'git checkout -f my-topic-branch-merge &&
git rebase --merge master-merge &&
test ! -d .git/rebase-merge'
test_expect_success 'rebase --merge topic branch that was partially merged upstream' '
git checkout -f my-topic-branch-merge &&
git rebase --merge master-merge &&
test ! -d .git/rebase-merge
'
test_done