Skip to content

sub-process: use gentle handshake to avoid die() on startup failure #2133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mmontalbo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

sub-process: use gentle handshake to avoid die() on startup failure #2133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions sub-process.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,17 +132,24 @@ static int handshake_version(struct child_process *process,
if (packet_flush_gently(process->in))
return error("Could not write flush packet");

if (!(line = packet_read_line(process->out, NULL)) ||
!skip_prefix(line, welcome_prefix, &p) ||
if (packet_read_line_gently(process->out, NULL, &line) < 0)
return error("could not read greeting from subprocess '%s'",
process->args.v[0]);
if (!line || !skip_prefix(line, welcome_prefix, &p) ||
strcmp(p, "-server"))
return error("Unexpected line '%s', expected %s-server",
line ? line : "<flush packet>", welcome_prefix);
if (!(line = packet_read_line(process->out, NULL)) ||
!skip_prefix(line, "version=", &p) ||
if (packet_read_line_gently(process->out, NULL, &line) < 0)
return error("could not read version from subprocess '%s'",
process->args.v[0]);
if (!line || !skip_prefix(line, "version=", &p) ||
strtol_i(p, 10, chosen_version))
return error("Unexpected line '%s', expected version",
line ? line : "<flush packet>");
if ((line = packet_read_line(process->out, NULL)))
if (packet_read_line_gently(process->out, NULL, &line) < 0)
return error("could not read version flush from subprocess '%s'",
process->args.v[0]);
if (line)
return error("Unexpected line '%s', expected flush", line);

/* Check to make sure that the version received is supported */
Expand Down Expand Up @@ -171,8 +178,15 @@ static int handshake_capabilities(struct child_process *process,
if (packet_flush_gently(process->in))
return error("Could not write flush packet");

while ((line = packet_read_line(process->out, NULL))) {
for (;;) {
const char *p;
int len = packet_read_line_gently(process->out, NULL, &line);

if (len < 0)
return error("could not read capabilities from subprocess '%s'",
process->args.v[0]);
if (!line)
break;
if (!skip_prefix(line, "capability=", &p))
continue;

Expand Down
17 changes: 17 additions & 0 deletions t/t0021-conversion.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,6 +857,23 @@ test_expect_success 'invalid process filter must fail (and not hang!)' '
)
'

test_expect_success 'missing process filter with space in path does not die' '
test_config_global filter.protocol.process "/non existent/tool" &&
test_config_global filter.protocol.required true &&
rm -rf repo &&
mkdir repo &&
(
cd repo &&
git init &&

echo "*.r filter=protocol" >.gitattributes &&

cp "$TEST_ROOT/test.o" test.r &&
test_must_fail git add . 2>git-stderr.log &&
test_grep "clean filter.*protocol.*failed" git-stderr.log
)
'

test_expect_success 'delayed checkout in process filter' '
test_config_global filter.a.process "test-tool rot13-filter --log=a.log clean smudge delay" &&
test_config_global filter.a.required true &&
Expand Down
Loading