summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar Anand Kumria <wildfire@progsoc.org>2008-08-14 23:40:38 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-08-14 18:14:23 -0700
commitd9429194f6e30e1f6f46a286217cd88972e1c83b (patch)
tree08cfeadd41f5c0366e56f41b00e2cf4feaa039e0 /contrib
parentPut in the two other configuration elements found in the source (diff)
downloadtgif-d9429194f6e30e1f6f46a286217cd88972e1c83b.tar.xz
Add p4 read_pipe and write_pipe wrappers
Two additional wrappers to cover 3 places where we utilise p4 in piped form. Found by Tor Arvid Lund. Signed-off-by: Anand Kumria <wildfire@progsoc.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/fast-import/git-p47
1 files changed, 7 insertions, 0 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 6c64224b77..3e9df70f29 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -69,6 +69,10 @@ def write_pipe(c, str):
return val
+def p4_write_pipe(c, str):
+ real_cmd = p4_build_cmd(c)
+ return write_pipe(c, str)
+
def read_pipe(c, ignore_error=False):
if verbose:
sys.stderr.write('Reading pipe: %s\n' % c)
@@ -80,6 +84,9 @@ def read_pipe(c, ignore_error=False):
return val
+def p4_read_pipe(c, ignore_error=False):
+ real_cmd = p4_build_cmd(c)
+ return read_pipe(real_cmd, ignore_error)
def read_pipe_lines(c):
if verbose: