SZEDER Gábor <[email protected]> writes:
> + git read-tree -i -m $c3 2>actual-err &&
> + test_must_be_empty expected-err &&
> + git update-index --ignore-missing --refresh 2>>actual-err &&
> + test_must_be_empty expected-err &&
> + git merge-recursive $c0 -- $c3 $c7 2>>actual-err &&
> + test_must_be_empty expected-err &&
> + git ls-files -s >actual-files 2>>actual-err &&
> + test_must_be_empty expected-err
Also, with the error output of individual steps tested like this
(assuming that test-must-be-empty checks are to be done on
the actual-err file, not ecpected-err that nobody creates), I do not
see a point in appending to the file. So perhaps squash this in?
t/t3030-merge-recursive.sh | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh
index cbeea1cf94..3563e77b37 100755
--- a/t/t3030-merge-recursive.sh
+++ b/t/t3030-merge-recursive.sh
@@ -526,13 +526,13 @@ test_expect_success 'merge-recursive w/ empty work tree -
ours has rename' '
export GIT_INDEX_FILE &&
mkdir "$GIT_WORK_TREE" &&
git read-tree -i -m $c7 2>actual-err &&
- test_must_be_empty expected-err &&
+ test_must_be_empty actual-err &&
git update-index --ignore-missing --refresh 2>actual-err &&
- test_must_be_empty expected-err &&
+ test_must_be_empty actual-err &&
git merge-recursive $c0 -- $c7 $c3 2>actual-err &&
- test_must_be_empty expected-err &&
+ test_must_be_empty actual-err &&
git ls-files -s >actual-files 2>actual-err &&
- test_must_be_empty expected-err
+ test_must_be_empty actual-err
) &&
cat >expected-files <<-EOF &&
100644 $o3 0 b/c
@@ -551,13 +551,13 @@ test_expect_success 'merge-recursive w/ empty work tree -
theirs has rename' '
export GIT_INDEX_FILE &&
mkdir "$GIT_WORK_TREE" &&
git read-tree -i -m $c3 2>actual-err &&
- test_must_be_empty expected-err &&
- git update-index --ignore-missing --refresh 2>>actual-err &&
- test_must_be_empty expected-err &&
- git merge-recursive $c0 -- $c3 $c7 2>>actual-err &&
- test_must_be_empty expected-err &&
- git ls-files -s >actual-files 2>>actual-err &&
- test_must_be_empty expected-err
+ test_must_be_empty actual-err &&
+ git update-index --ignore-missing --refresh 2>actual-err &&
+ test_must_be_empty actual-err &&
+ git merge-recursive $c0 -- $c3 $c7 2>actual-err &&
+ test_must_be_empty actual-err &&
+ git ls-files -s >actual-files 2>actual-err &&
+ test_must_be_empty actual-err
) &&
cat >expected-files <<-EOF &&
100644 $o3 0 b/c
