summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Jonathan Tan <jonathantanmy@google.com>2017-07-26 11:17:29 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-07-26 13:00:40 -0700
commitfa64a2fdbeedd98c5f24d1662bcc470a8449abcf (patch)
tree7da566f387a1f3253d7ecc98a48495d311881988 /t
parentDocumentation: migrate sub-process docs to header (diff)
downloadtgif-fa64a2fdbeedd98c5f24d1662bcc470a8449abcf.tar.xz
sub-process: refactor handshake to common function
Refactor, into a common function, the version and capability negotiation done when invoking a long-running process as a clean or smudge filter. This will be useful for other Git code that needs to interact similarly with a long-running process. As you can see in the change to t0021, this commit changes the error message reported when the long-running process does not introduce itself with the expected "server"-terminated line. Originally, the error message reports that the filter "does not support filter protocol version 2", differentiating between the old single-file filter protocol and the new multi-file filter protocol - I have updated it to something more generic and useful. Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t0021-conversion.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index eb3d83744a..46f8e583c3 100755
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -697,7 +697,7 @@ test_expect_success PERL 'invalid process filter must fail (and not hang!)' '
cp "$TEST_ROOT/test.o" test.r &&
test_must_fail git add . 2>git-stderr.log &&
- grep "does not support filter protocol version" git-stderr.log
+ grep "expected git-filter-server" git-stderr.log
)
'