global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-13 10:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'en/merge-recursive' into next

Browse Source 
* en/merge-recursive:
  t6022: Use -eq not = to test output of wc -l
This commit is contained in:
Junio C Hamano
2010-11-17 13:59:03 -08:00
parent bd58c4692f 9f6cea97c9
commit 1b6f865374
1 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
t/t6022-merge-rename.sh
View File

@@ -306,8 +306,8 @@ test_expect_success 'Rename+D/F conflict; renamed file merges but dir in way' '
grep "Auto-merging dir" output &&
grep "Adding as dir~HEAD instead" output &&
test 2 = "$(git ls-files -u | wc -l)" &&
test 2 = "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
test 2 -eq "$(git ls-files -u | wc -l)" &&
test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
test_must_fail git diff --quiet &&
test_must_fail git diff --cached --quiet &&
@@ -328,8 +328,8 @@ test_expect_success 'Same as previous, but merged other way' '
grep "Auto-merging dir" output &&
grep "Adding as dir~renamed-file-has-no-conflicts instead" output &&
test 2 = "$(git ls-files -u | wc -l)" &&
test 2 = "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
test 2 -eq "$(git ls-files -u | wc -l)" &&
test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
test_must_fail git diff --quiet &&
test_must_fail git diff --cached --quiet &&
@@ -363,8 +363,8 @@ test_expect_success 'Rename+D/F conflict; renamed file cannot merge, dir not in
git checkout -q renamed-file-has-conflicts^0 &&
test_must_fail git merge --strategy=recursive dir-not-in-way &&
test 3 = "$(git ls-files -u | wc -l)" &&
test 3 = "$(git ls-files -u dir | wc -l)" &&
test 3 -eq "$(git ls-files -u | wc -l)" &&
test 3 -eq "$(git ls-files -u dir | wc -l)" &&
test_must_fail git diff --quiet &&
test_must_fail git diff --cached --quiet &&
@@ -381,9 +381,9 @@ test_expect_success 'Rename+D/F conflict; renamed file cannot merge and dir in t
git checkout -q renamed-file-has-conflicts^0 &&
test_must_fail git merge --strategy=recursive dir-in-way &&
test 5 = "$(git ls-files -u | wc -l)" &&
test 3 = "$(git ls-files -u dir | grep -v file-in-the-way | wc -l)" &&
test 2 = "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
test 5 -eq "$(git ls-files -u | wc -l)" &&
test 3 -eq "$(git ls-files -u dir | grep -v file-in-the-way | wc -l)" &&
test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
test_must_fail git diff --quiet &&
test_must_fail git diff --cached --quiet &&
@@ -417,9 +417,9 @@ test_expect_success 'Same as previous, but merged other way' '
git checkout -q dir-in-way^0 &&
test_must_fail git merge --strategy=recursive renamed-file-has-conflicts &&
test 5 = "$(git ls-files -u | wc -l)" &&
test 3 = "$(git ls-files -u dir | grep -v file-in-the-way | wc -l)" &&
test 2 = "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
test 5 -eq "$(git ls-files -u | wc -l)" &&
test 3 -eq "$(git ls-files -u dir | grep -v file-in-the-way | wc -l)" &&
test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
test_must_fail git diff --quiet &&
test_must_fail git diff --cached --quiet &&
@@ -457,7 +457,7 @@ test_expect_success 'both rename source and destination involved in D/F conflict
git checkout -q rename-dest^0 &&
test_must_fail git merge --strategy=recursive source-conflict &&
test 1 = "$(git ls-files -u | wc -l)" &&
test 1 -eq "$(git ls-files -u | wc -l)" &&
test_must_fail git diff --quiet &&
@@ -496,13 +496,13 @@ test_expect_success 'pair rename to parent of other (D/F conflicts) w/ untracked
mkdir one &&
test_must_fail git merge --strategy=recursive rename-two &&
test 2 = "$(git ls-files -u | wc -l)" &&
test 1 = "$(git ls-files -u one | wc -l)" &&
test 1 = "$(git ls-files -u two | wc -l)" &&
test 2 -eq "$(git ls-files -u | wc -l)" &&
test 1 -eq "$(git ls-files -u one | wc -l)" &&
test 1 -eq "$(git ls-files -u two | wc -l)" &&
test_must_fail git diff --quiet &&
test 4 = $(find . | grep -v .git | wc -l) &&
test 4 -eq $(find . | grep -v .git | wc -l) &&
test -d one &&
test -f one~rename-two &&
@@ -516,13 +516,13 @@ test_expect_success 'pair rename to parent of other (D/F conflicts) w/ clean sta
git clean -fdqx &&
test_must_fail git merge --strategy=recursive rename-two &&
test 2 = "$(git ls-files -u | wc -l)" &&
test 1 = "$(git ls-files -u one | wc -l)" &&
test 1 = "$(git ls-files -u two | wc -l)" &&
test 2 -eq "$(git ls-files -u | wc -l)" &&
test 1 -eq "$(git ls-files -u one | wc -l)" &&
test 1 -eq "$(git ls-files -u two | wc -l)" &&
test_must_fail git diff --quiet &&
test 3 = $(find . | grep -v .git | wc -l) &&
test 3 -eq $(find . | grep -v .git | wc -l) &&
test -f one &&
test -f two &&
@@ -558,12 +558,12 @@ test_expect_success 'check handling of differently renamed file with D/F conflic
git checkout -q first-rename^0 &&
test_must_fail git merge --strategy=recursive second-rename &&
test 5 = "$(git ls-files -s | wc -l)" &&
test 3 = "$(git ls-files -u | wc -l)" &&
test 1 = "$(git ls-files -u one | wc -l)" &&
test 1 = "$(git ls-files -u two | wc -l)" &&
test 1 = "$(git ls-files -u original | wc -l)" &&
test 2 = "$(git ls-files -o | wc -l)" &&
test 5 -eq "$(git ls-files -s | wc -l)" &&
test 3 -eq "$(git ls-files -u | wc -l)" &&
test 1 -eq "$(git ls-files -u one | wc -l)" &&
test 1 -eq "$(git ls-files -u two | wc -l)" &&
test 1 -eq "$(git ls-files -u original | wc -l)" &&
test 2 -eq "$(git ls-files -o | wc -l)" &&
test -f one/file &&
test -f two/file &&
@@ -598,11 +598,11 @@ test_expect_success 'check handling of differently renamed file with D/F conflic
git checkout -q first-rename-redo^0 &&
test_must_fail git merge --strategy=recursive second-rename-redo &&
test 3 = "$(git ls-files -u | wc -l)" &&
test 1 = "$(git ls-files -u one | wc -l)" &&
test 1 = "$(git ls-files -u two | wc -l)" &&
test 1 = "$(git ls-files -u original | wc -l)" &&
test 0 = "$(git ls-files -o | wc -l)" &&
test 3 -eq "$(git ls-files -u | wc -l)" &&
test 1 -eq "$(git ls-files -u one | wc -l)" &&
test 1 -eq "$(git ls-files -u two | wc -l)" &&
test 1 -eq "$(git ls-files -u original | wc -l)" &&
test 0 -eq "$(git ls-files -o | wc -l)" &&
test -f one &&
test -f two &&