Re: [PATCH 2/4] t7610: make tests more independent and debuggable

[Richard Hansen]

On 2017-01-05 07:20, Simon Ruderich wrote:

On Tue, Jan 03, 2017 at 07:50:40PM -0500, Richard Hansen wrote:

[snip]
@@ -145,8 +148,13 @@ test_expect_success 'mergetool in subdir' '
 '

 test_expect_success 'mergetool on file in parent dir' '
+       git reset --hard &&
+       git checkout -b test$test_count branch1 &&
+       git submodule update -N &&
        (
                cd subdir &&
+               test_must_fail git merge master >/dev/null 2>&1 &&
+               ( yes "" | git mergetool file3 >/dev/null 2>&1 ) &&

This change seems unrelated to the changes mentioned in the
commit message. Was it intended?

Thanks,
Richard

Yes, that is intentional; without this change, the test depends on the successful completion of the previous test. I'll improve the commit message.

Regards
Simon

smime.p7s
Description: S/MIME Cryptographic Signature