In t6402, we're checking number of files in the index and the working
tree by piping the output of "git ls-files" to "wc -l", thus losing the
exit status code of git.
Let's write the output of "git ls-files" to a temporary file, in order
to check exit status code of "git ls-files" properly.
While we're at it, also check exit status code of an invocation of
git-rev-parse, too.
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@xxxxxxxxx>
---
t/t6402-merge-rename.sh | 146 +++++++++++++++++++++-------------------
1 file changed, 78 insertions(+), 68 deletions(-)
diff --git a/t/t6402-merge-rename.sh b/t/t6402-merge-rename.sh
index 425dad97d5..fbfa8967b0 100755
--- a/t/t6402-merge-rename.sh
+++ b/t/t6402-merge-rename.sh
@@ -11,6 +11,20 @@ modify () {
mv "$2.x" "$2"
}
+check_ls_files_count() {
+ local ops val
+ if test "$#" -le 2
+ then
+ BUG "Expect 2 or more arguments"
+ fi &&
+ ops="$1" &&
+ val="$2" &&
+ shift 2 &&
+ mkdir -p .git/trash &&
+ git ls-files "$@" >.git/trash/output &&
+ test_line_count "$ops" "$val" .git/trash/output
+}
+
test_expect_success 'setup' '
cat >A <<-\EOF &&
a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
@@ -105,10 +119,8 @@ test_expect_success 'pull renaming branch into unrenaming one' \
git show-branch &&
test_expect_code 1 git pull . white &&
git ls-files -s &&
- git ls-files -u B >b.stages &&
- test_line_count = 3 b.stages &&
- git ls-files -s N >n.stages &&
- test_line_count = 1 n.stages &&
+ check_ls_files_count = 3 -u B &&
+ check_ls_files_count = 1 -s N &&
sed -ne "/^g/{
p
q
@@ -122,10 +134,8 @@ test_expect_success 'pull renaming branch into another renaming one' \
git reset --hard &&
git checkout red &&
test_expect_code 1 git pull . white &&
- git ls-files -u B >b.stages &&
- test_line_count = 3 b.stages &&
- git ls-files -s N >n.stages &&
- test_line_count = 1 n.stages &&
+ check_ls_files_count = 3 -u B &&
+ check_ls_files_count = 1 -s N &&
sed -ne "/^g/{
p
q
@@ -138,10 +148,8 @@ test_expect_success 'pull unrenaming branch into renaming one' \
git reset --hard &&
git show-branch &&
test_expect_code 1 git pull . main &&
- git ls-files -u B >b.stages &&
- test_line_count = 3 b.stages &&
- git ls-files -s N >n.stages &&
- test_line_count = 1 n.stages &&
+ check_ls_files_count = 3 -u B &&
+ check_ls_files_count = 1 -s N &&
sed -ne "/^g/{
p
q
@@ -154,14 +162,10 @@ test_expect_success 'pull conflicting renames' \
git reset --hard &&
git show-branch &&
test_expect_code 1 git pull . blue &&
- git ls-files -u A >a.stages &&
- test_line_count = 1 a.stages &&
- git ls-files -u B >b.stages &&
- test_line_count = 1 b.stages &&
- git ls-files -u C >c.stages &&
- test_line_count = 1 c.stages &&
- git ls-files -s N >n.stages &&
- test_line_count = 1 n.stages &&
+ check_ls_files_count = 1 -u A &&
+ check_ls_files_count = 1 -u B &&
+ check_ls_files_count = 1 -u C &&
+ check_ls_files_count = 1 -s N &&
sed -ne "/^g/{
p
q
@@ -330,8 +334,8 @@ test_expect_success 'Rename+D/F conflict; renamed file merges but dir in way' '
test_i18ngrep "Adding as dir~HEAD instead" output
fi &&
- test 3 -eq "$(git ls-files -u | wc -l)" &&
- test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
+ check_ls_files_count = 3 -u &&
+ check_ls_files_count = 2 -u dir/file-in-the-way &&
test_must_fail git diff --quiet &&
test_must_fail git diff --cached --quiet &&
@@ -357,8 +361,8 @@ test_expect_success 'Same as previous, but merged other way' '
test_i18ngrep "Adding as dir~renamed-file-has-no-conflicts instead" output
fi &&
- test 3 -eq "$(git ls-files -u | wc -l)" &&
- test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
+ check_ls_files_count = 3 -u &&
+ check_ls_files_count = 2 -u dir/file-in-the-way &&
test_must_fail git diff --quiet &&
test_must_fail git diff --cached --quiet &&
@@ -374,8 +378,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 -eq "$(git ls-files -u | wc -l)" &&
- test 3 -eq "$(git ls-files -u dir | wc -l)" &&
+ check_ls_files_count = 3 -u &&
+ check_ls_files_count = 3 -u dir &&
test_must_fail git diff --quiet &&
test_must_fail git diff --cached --quiet &&
@@ -409,14 +413,16 @@ 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 -eq "$(git ls-files -u | wc -l)" &&
+ check_ls_files_count = 5 -u &&
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
- test 3 -eq "$(git ls-files -u dir~HEAD | wc -l)"
+ check_ls_files_count = 3 -u dir~HEAD
else
- test 3 -eq "$(git ls-files -u dir | grep -v file-in-the-way | wc -l)"
+ git ls-files -u dir >out &&
+ test 3 -eq $(grep -v file-in-the-way out | wc -l) &&
+ rm -f out
fi &&
- test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
+ check_ls_files_count = 2 -u dir/file-in-the-way &&
test_must_fail git diff --quiet &&
test_must_fail git diff --cached --quiet &&
@@ -432,14 +438,16 @@ 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 -eq "$(git ls-files -u | wc -l)" &&
+ check_ls_files_count = 5 -u &&
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
- test 3 -eq "$(git ls-files -u dir~renamed-file-has-conflicts | wc -l)"
+ check_ls_files_count = 3 -u dir~renamed-file-has-conflicts
else
- test 3 -eq "$(git ls-files -u dir | grep -v file-in-the-way | wc -l)"
+ git ls-files -u dir >out &&
+ test 3 -eq $(grep -v file-in-the-way out | wc -l) &&
+ rm -f out
fi &&
- test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
+ check_ls_files_count = 2 -u dir/file-in-the-way &&
test_must_fail git diff --quiet &&
test_must_fail git diff --cached --quiet &&
@@ -496,9 +504,9 @@ test_expect_success 'both rename source and destination involved in D/F conflict
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
- test 2 -eq "$(git ls-files -u | wc -l)"
+ check_ls_files_count = 2 -u
else
- test 1 -eq "$(git ls-files -u | wc -l)"
+ check_ls_files_count = 1 -u
fi &&
test_must_fail git diff --quiet &&
@@ -540,9 +548,9 @@ then
mkdir one &&
test_must_fail git merge --strategy=recursive rename-two &&
- test 4 -eq "$(git ls-files -u | wc -l)" &&
- test 2 -eq "$(git ls-files -u one | wc -l)" &&
- test 2 -eq "$(git ls-files -u two | wc -l)" &&
+ check_ls_files_count = 4 -u &&
+ check_ls_files_count = 2 -u one &&
+ check_ls_files_count = 2 -u two &&
test_must_fail git diff --quiet &&
@@ -559,9 +567,9 @@ else
mkdir one &&
test_must_fail git merge --strategy=recursive rename-two &&
- 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)" &&
+ check_ls_files_count = 2 -u &&
+ check_ls_files_count = 1 -u one &&
+ check_ls_files_count = 1 -u two &&
test_must_fail git diff --quiet &&
@@ -582,13 +590,13 @@ test_expect_success 'pair rename to parent of other (D/F conflicts) w/ clean sta
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
- test 4 -eq "$(git ls-files -u | wc -l)" &&
- test 2 -eq "$(git ls-files -u one | wc -l)" &&
- test 2 -eq "$(git ls-files -u two | wc -l)"
+ check_ls_files_count = 4 -u &&
+ check_ls_files_count = 2 -u one &&
+ check_ls_files_count = 2 -u two
else
- 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)"
+ check_ls_files_count = 2 -u &&
+ check_ls_files_count = 1 -u one &&
+ check_ls_files_count = 1 -u two
fi &&
test_must_fail git diff --quiet &&
@@ -631,19 +639,19 @@ test_expect_success 'check handling of differently renamed file with D/F conflic
if test "$GIT_TEST_MERGE_ALGORITHM" = ort
then
- 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~HEAD | wc -l)" &&
- test 1 -eq "$(git ls-files -u two~second-rename | wc -l)" &&
- test 1 -eq "$(git ls-files -u original | wc -l)" &&
- test 0 -eq "$(git ls-files -o | wc -l)"
+ check_ls_files_count = 5 -s &&
+ check_ls_files_count = 3 -u &&
+ check_ls_files_count = 1 -u one~HEAD &&
+ check_ls_files_count = 1 -u two~second-rename &&
+ check_ls_files_count = 1 -u original &&
+ check_ls_files_count = 0 -o
else
- 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)"
+ check_ls_files_count = 5 -s &&
+ check_ls_files_count = 3 -u &&
+ check_ls_files_count = 1 -u one &&
+ check_ls_files_count = 1 -u two &&
+ check_ls_files_count = 1 -u original &&
+ check_ls_files_count = 2 -o
fi &&
test_path_is_file one/file &&
@@ -679,11 +687,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 -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)" &&
+ check_ls_files_count = 3 -u &&
+ check_ls_files_count = 1 -u one &&
+ check_ls_files_count = 1 -u two &&
+ check_ls_files_count = 1 -u original &&
+ check_ls_files_count = 0 -o &&
test_path_is_file one &&
test_path_is_file two &&
@@ -861,9 +869,11 @@ test_expect_success 'setup merge of rename + small change' '
test_expect_success 'merge rename + small change' '
git merge rename_branch &&
- test 1 -eq $(git ls-files -s | wc -l) &&
- test 0 -eq $(git ls-files -o | wc -l) &&
- test $(git rev-parse HEAD:renamed_file) = $(git rev-parse HEAD~1:file)
+ check_ls_files_count = 1 -s &&
+ check_ls_files_count = 0 -o &&
+ newhash=$(git rev-parse HEAD:renamed_file) &&
+ oldhash=$(git rev-parse HEAD~1:file) &&
+ test $newhash = $oldhash
'
test_expect_success 'setup for use of extended merge markers' '
--
2.32.0.278.gd42b80f139
