X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=contrib%2Ffast-import%2Fgit-p4;h=04ce7e3b020f489d59fe103970fc989d7b351127;hb=09a8fbd59cb18c222db732e053c17583f7f06840;hp=c1ea643ace920e83a5577948553d4c9d1046abec;hpb=7e00a9104bc8ce27f73132fbaa8f8528e26206a8;p=git.git diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index c1ea643ac..04ce7e3b0 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -706,7 +706,9 @@ class P4Submit(Command): submitTemplate = self.prepareLogMessage(template, logMessage) if os.environ.has_key("P4DIFF"): del(os.environ["P4DIFF"]) - diff = p4_read_pipe("diff -du ...") + diff = "" + for editedFile in editedFiles: + diff += p4_read_pipe("diff -du %r" % editedFile) newdiff = "" for newFile in filesToAdd: