Re: [BUG] t9801 and t9803 broken on next

From: Eric Wong <e@80x24.org>
Date: May 17, 2016, 09:13 UTC
Message-ID: <20160517091342.GA10180@dcvr.yhbt.net>
In-Reply-To: <5E7631C9-DD59-4358-B907-D7C7AEA1739C@gmail.com>

Lars Schneider <larsxschneider@gmail.com> wrote:

> I am no expert in "fast-import". Does anyone have a few hints how to
> proceed?

I don't know fast-import or the C internals of git well at all, either. But capturing the exact input to fast-import (using tee) would be useful for non-p4 users to debug the problem and would go a long way in reproducing a standalone test case.

I'm Python-illiterate , but hopefully this works to capture the stdin fed to fast-import (totally untested):

--- a/git-p4.py
+++ b/git-p4.py
@@ -3366,7 +3366,8 @@ class P4Sync(Command, P4UserMap):
 
         self.tz = "%+03d%02d" % (- time.timezone / 3600, ((- time.timezone % 3600) / 60))
 
-        self.importProcess = subprocess.Popen(["git", "fast-import"],
+        cmd = [ "sh", "-c", "tee /tmp/gfi-in.$$ | git fast-import" ]
+        self.importProcess = subprocess.Popen(cmd,
                                               stdin=subprocess.PIPE,
                                               stdout=subprocess.PIPE,
                                               stderr=subprocess.PIPE);