Merge origin.

diff --cc contrib/fast-import/git-p4
index b280e9774227100015cb3c6c8ae7448d0ce844f0,794286ee8e43394c93c0aae66d540efc2da8d26e..28ea53dea4c45fb3112bea175a4f91d5fe0e0d7d
--- 1/contrib/fast-import/git-p4
--- 2/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@@ -35,8 -35,8 +35,8 @@@ def read_pipe(c, ignore_error=False)
  
      pipe = os.popen(c, 'rb')
      val = pipe.read()
 -    if pipe.close():
 -        sys.stderr.write('Command failed: %s' % c)
 +    if pipe.close() and not ignore_error:
-         sys.stderr.write('Command %s failed\n' % c)
++        sys.stderr.write('Command failed: %s\n' % c)
          sys.exit(1)
  
      return val
@@@ -49,7 -49,7 +49,7 @@@ def read_pipe_lines(c)
      pipe = os.popen(c, 'rb')
      val = pipe.readlines()
      if pipe.close():
-         sys.stderr.write('Command %s failed\n' % c)
 -        sys.stderr.write('Command failed: %s' % c)
++        sys.stderr.write('Command failed: %s\n' % c)
          sys.exit(1)
  
      return val