From 88c50259d8d19fd580987e438401fd7d19439746 Mon Sep 17 00:00:00 2001
From: Ole Tange <ole@tange.dk>
Date: Thu, 28 Jun 2012 22:38:14 +0700
Subject: [PATCH] parallel: Fixed bug #36707: --controlmaster eats jobs

---
 src/parallel                               | 2 +-
 testsuite/tests-to-run/parallel-local20.sh | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/parallel b/src/parallel
index e173e1db..e27ab762 100755
--- a/src/parallel
+++ b/src/parallel
@@ -2941,7 +2941,7 @@ sub sshcommand_of_sshlogin {
                     $Global::sshmaster{$pid}++;
                 } else {
                     ::debug($master,"\n");
-                    `$master`;
+                    `$master </dev/null`;
                     ::wait_and_exit(0);
                 }
             }
diff --git a/testsuite/tests-to-run/parallel-local20.sh b/testsuite/tests-to-run/parallel-local20.sh
index f2fe6576..335f4cc9 100644
--- a/testsuite/tests-to-run/parallel-local20.sh
+++ b/testsuite/tests-to-run/parallel-local20.sh
@@ -30,5 +30,9 @@ EOF
 chmod 755 '/tmp/she <bang>"'
 seq 1 3 >/tmp/123
 '/tmp/she <bang>"'
+
 echo '### bug #36595: silent loss of input with --pipe and --sshlogin'
 seq 10000 | xargs | parallel --pipe -S 10/localhost cat | wc
+
+echo 'bug #36707: --controlmaster eats jobs'
+seq 2 | parallel --controlmaster --sshlogin localhost echo OK{}