I'm just posting this to the list because I should really already be in bed...
Running t7610-mergetool with -q isn't quiet. This is also noticeable when running the full test suite in a TAP harness (e.g. prove).
$ ./t7610-mergetool.sh -q
Normal merge conflict for 'file1':
{local}: modified
{remote}: modified
Normal merge conflict for 'file2':
{local}: created
{remote}: created
Normal merge conflict for 'subdir/file3':
{local}: modified
{remote}: modified
# passed all 7 test(s)
1..7
All the output seems to be from the last test.
Also, some of the test style seems odd. For example:
test_expect_success 'mergetool on file in parent dir' '
cd subdir && (
( yes "" | git mergetool ../file1 >/dev/null 2>&1 ) &&
( yes "" | git mergetool ../file2 >/dev/null 2>&1 ) &&
test "$(cat ../file1)" = "master updated" &&
test "$(cat ../file2)" = "master new" &&
git commit -m "branch1 resolved with mergetool - subdir") &&
cd ..
'
Shouldn't that just be :
(
cd subdir &&
yadda &&
yadda
)
If nobody else gets to it, hopefully I'll find time tomorrow. If not, I should get a fresh supply of tuits over the weekend.
~~ Brian--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html