Skip to content

Commit 1c45e39

Browse files
committed
Merge branch 'cc/subprocess-handshake-missing-capabilities' into maint
Finishing touches to a topic already in 'master'. * cc/subprocess-handshake-missing-capabilities: subprocess: loudly die when subprocess asks for an unsupported capability
2 parents 110a642 + ab46e6f commit 1c45e39

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

sub-process.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ static int handshake_capabilities(struct child_process *process,
180180
if (supported_capabilities)
181181
*supported_capabilities |= capabilities[i].flag;
182182
} else {
183-
warning("subprocess '%s' requested unsupported capability '%s'",
184-
process->argv[0], p);
183+
die("subprocess '%s' requested unsupported capability '%s'",
184+
process->argv[0], p);
185185
}
186186
}
187187

0 commit comments

Comments
 (0)