undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t6020: Modernize style a bit

Browse Source 
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2010-09-20 02:28:42 -06:00 committed by Junio C Hamano
parent 707983484b
commit d09c0a3935
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
t/t6020-merge-df.sh
View File

@ -6,21 +6,26 @@
test_description='Test merge with directory/file conflicts' test_description='Test merge with directory/file conflicts'
. ./test-lib.sh . ./test-lib.sh
test_expect_success 'prepare repository' \ test_expect_success 'prepare repository' '
'echo "Hello" > init && echo Hello >init &&
git add init && git add init &&
git commit -m "Initial commit" && git commit -m initial &&
git branch B &&
mkdir dir &&
echo "foo" > dir/foo &&
git add dir/foo &&
git commit -m "File: dir/foo" &&
git checkout B &&
echo "file dir" > dir &&
git add dir &&
git commit -m "File: dir"'
test_expect_code 1 'Merge with d/f conflicts' 'git merge "merge msg" B master' git branch B &&
mkdir dir &&
echo foo >dir/foo &&
git add dir/foo &&
git commit -m "File: dir/foo" &&
git checkout B &&
echo file dir >dir &&
git add dir &&
git commit -m "File: dir"
'
test_expect_success 'Merge with d/f conflicts' '
test_must_fail git merge master
'
test_expect_success 'F/D conflict' ' test_expect_success 'F/D conflict' '
git reset --hard && git reset --hard &&