kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
Browse Source

t6022 (renaming merge): chain test commands with && 

Using 'return' in an attempt to end a test assertion can have
unpredictable results (probably escaping from test_run_ and breaking
its bookkeeping).  Redo the control flow using helpers like
test_expect_code and git diff --exit-code, so each test assertion can
follow the usual form

	command that should succeed &&
	command that should succeed &&
	command that should succeed &&
	...

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jonathan Nieder 15 years ago committed by Junio C Hamano
parent
fb3340a6a7
commit
cae3aa79aa
1 changed files with 92 additions and 190 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 282
      t/t6022-merge-rename.sh

282
t/t6022-merge-rename.sh
Unescape View File

@ -94,245 +94,147 @@ git checkout master'


test_expect_success 'pull renaming branch into unrenaming one' \ test_expect_success 'pull renaming branch into unrenaming one' \
' '
git show-branch git show-branch &&
git pull . white && { test_expect_code 1 git pull . white &&
echo "BAD: should have conflicted" git ls-files -s &&
return 1 git ls-files -u B >b.stages &&
} test_line_count = 3 b.stages &&
git ls-files -s git ls-files -s N >n.stages &&
test "$(git ls-files -u B | wc -l)" -eq 3 || { test_line_count = 1 n.stages &&
echo "BAD: should have left stages for B"
return 1
}
test "$(git ls-files -s N | wc -l)" -eq 1 || {
echo "BAD: should have merged N"
return 1
}
sed -ne "/^g/{ sed -ne "/^g/{
p p
q q
}" B | grep master || { }" B | grep master &&
echo "BAD: should have listed our change first" git diff --exit-code white N
return 1
}
test "$(git diff white N | wc -l)" -eq 0 || {
echo "BAD: should have taken colored branch"
return 1
}
' '


test_expect_success 'pull renaming branch into another renaming one' \ test_expect_success 'pull renaming branch into another renaming one' \
' '
rm -f B rm -f B &&
git reset --hard git reset --hard &&
git checkout red git checkout red &&
git pull . white && { test_expect_code 1 git pull . white &&
echo "BAD: should have conflicted" git ls-files -u B >b.stages &&
return 1 test_line_count = 3 b.stages &&
} git ls-files -s N >n.stages &&
test "$(git ls-files -u B | wc -l)" -eq 3 || { test_line_count = 1 n.stages &&
echo "BAD: should have left stages"
return 1
}
test "$(git ls-files -s N | wc -l)" -eq 1 || {
echo "BAD: should have merged N"
return 1
}
sed -ne "/^g/{ sed -ne "/^g/{
p p
q q
}" B | grep red || { }" B | grep red &&
echo "BAD: should have listed our change first" git diff --exit-code white N
return 1
}
test "$(git diff white N | wc -l)" -eq 0 || {
echo "BAD: should have taken colored branch"
return 1
}
' '


test_expect_success 'pull unrenaming branch into renaming one' \ test_expect_success 'pull unrenaming branch into renaming one' \
' '
git reset --hard git reset --hard &&
git show-branch git show-branch &&
git pull . master && { test_expect_code 1 git pull . master &&
echo "BAD: should have conflicted" git ls-files -u B >b.stages &&
return 1 test_line_count = 3 b.stages &&
} git ls-files -s N >n.stages &&
test "$(git ls-files -u B | wc -l)" -eq 3 || { test_line_count = 1 n.stages &&
echo "BAD: should have left stages"
return 1
}
test "$(git ls-files -s N | wc -l)" -eq 1 || {
echo "BAD: should have merged N"
return 1
}
sed -ne "/^g/{ sed -ne "/^g/{
p p
q q
}" B | grep red || { }" B | grep red &&
echo "BAD: should have listed our change first" git diff --exit-code white N
return 1
}
test "$(git diff white N | wc -l)" -eq 0 || {
echo "BAD: should have taken colored branch"
return 1
}
' '


test_expect_success 'pull conflicting renames' \ test_expect_success 'pull conflicting renames' \
' '
git reset --hard git reset --hard &&
git show-branch git show-branch &&
git pull . blue && { test_expect_code 1 git pull . blue &&
echo "BAD: should have conflicted" git ls-files -u A >a.stages &&
return 1 test_line_count = 1 a.stages &&
} git ls-files -u B >b.stages &&
test "$(git ls-files -u A | wc -l)" -eq 1 || { test_line_count = 1 b.stages &&
echo "BAD: should have left a stage" git ls-files -u C >c.stages &&
return 1 test_line_count = 1 c.stages &&
} git ls-files -s N >n.stages &&
test "$(git ls-files -u B | wc -l)" -eq 1 || { test_line_count = 1 n.stages &&
echo "BAD: should have left a stage"
return 1
}
test "$(git ls-files -u C | wc -l)" -eq 1 || {
echo "BAD: should have left a stage"
return 1
}
test "$(git ls-files -s N | wc -l)" -eq 1 || {
echo "BAD: should have merged N"
return 1
}
sed -ne "/^g/{ sed -ne "/^g/{
p p
q q
}" B | grep red || { }" B | grep red &&
echo "BAD: should have listed our change first" git diff --exit-code white N
return 1
}
test "$(git diff white N | wc -l)" -eq 0 || {
echo "BAD: should have taken colored branch"
return 1
}
' '


test_expect_success 'interference with untracked working tree file' ' test_expect_success 'interference with untracked working tree file' '

git reset --hard &&
git reset --hard git show-branch &&
git show-branch echo >A this file should not matter &&
echo >A this file should not matter test_expect_code 1 git pull . white &&
git pull . white && { test_path_is_file A
echo "BAD: should have conflicted"
return 1
}
test -f A || {
echo "BAD: should have left A intact"
return 1
}
' '


test_expect_success 'interference with untracked working tree file' ' test_expect_success 'interference with untracked working tree file' '

git reset --hard &&
git reset --hard git checkout white &&
git checkout white git show-branch &&
git show-branch rm -f A &&
rm -f A echo >A this file should not matter &&
echo >A this file should not matter test_expect_code 1 git pull . red &&
git pull . red && { test_path_is_file A
echo "BAD: should have conflicted"
return 1
}
test -f A || {
echo "BAD: should have left A intact"
return 1
}
' '


test_expect_success 'interference with untracked working tree file' ' test_expect_success 'interference with untracked working tree file' '

git reset --hard &&
git reset --hard rm -f A M &&
rm -f A M git checkout -f master &&
git checkout -f master git tag -f anchor &&
git tag -f anchor git show-branch &&
git show-branch git pull . yellow &&
git pull . yellow || { test_path_is_missing M &&
echo "BAD: should have cleanly merged"
return 1
}
test -f M && {
echo "BAD: should have removed M"
return 1
}
git reset --hard anchor git reset --hard anchor
' '


test_expect_success 'updated working tree file should prevent the merge' ' test_expect_success 'updated working tree file should prevent the merge' '

git reset --hard &&
git reset --hard rm -f A M &&
rm -f A M git checkout -f master &&
git checkout -f master git tag -f anchor &&
git tag -f anchor git show-branch &&
git show-branch echo >>M one line addition &&
echo >>M one line addition cat M >M.saved &&
cat M >M.saved test_expect_code 128 git pull . yellow &&
git pull . yellow && { test_cmp M M.saved &&
echo "BAD: should have complained"
return 1
}
test_cmp M M.saved || {
echo "BAD: should have left M intact"
return 1
}
rm -f M.saved rm -f M.saved
' '


test_expect_success 'updated working tree file should prevent the merge' ' test_expect_success 'updated working tree file should prevent the merge' '

git reset --hard &&
git reset --hard rm -f A M &&
rm -f A M git checkout -f master &&
git checkout -f master git tag -f anchor &&
git tag -f anchor git show-branch &&
git show-branch echo >>M one line addition &&
echo >>M one line addition cat M >M.saved &&
cat M >M.saved git update-index M &&
git update-index M test_expect_code 128 git pull . yellow &&
git pull . yellow && { test_cmp M M.saved &&
echo "BAD: should have complained"
return 1
}
test_cmp M M.saved || {
echo "BAD: should have left M intact"
return 1
}
rm -f M.saved rm -f M.saved
' '


test_expect_success 'interference with untracked working tree file' ' test_expect_success 'interference with untracked working tree file' '

git reset --hard &&
git reset --hard rm -f A M &&
rm -f A M git checkout -f yellow &&
git checkout -f yellow git tag -f anchor &&
git tag -f anchor git show-branch &&
git show-branch echo >M this file should not matter &&
echo >M this file should not matter git pull . master &&
git pull . master || { test_path_is_file M &&
echo "BAD: should have cleanly merged" ! {
return 1 git ls-files -s |
} grep M
test -f M || { } &&
echo "BAD: should have left M intact"
return 1
}
git ls-files -s | grep M && {
echo "BAD: M must be untracked in the result"
return 1
}
git reset --hard anchor git reset --hard anchor
' '


test_expect_success 'merge of identical changes in a renamed file' ' test_expect_success 'merge of identical changes in a renamed file' '
rm -f A M N rm -f A M N &&
git reset --hard && git reset --hard &&
git checkout change+rename && git checkout change+rename &&
GIT_MERGE_VERBOSITY=3 git merge change | grep "^Skipped B" && GIT_MERGE_VERBOSITY=3 git merge change | grep "^Skipped B" &&

Write Preview
Loading…
Cancel
Save