git-p4: Fix error message crash in P4Sync.commit.
authorTor Arvid Lund <torarvid@gmail.com>
Tue, 15 Mar 2011 12:08:03 +0000 (13:08 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Mar 2011 23:07:21 +0000 (16:07 -0700)
There is an error message that crashes the script because of an invalid ref
to the non-existing "path" variable. It is almost never printed, which
would explain why nobody encountered this problem before... But anyway,
this oneliner fixes it.

Signed-off-by: Tor Arvid Lund <torarvid@gmail.com>
Acked-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/fast-import/git-p4

index d47596f3280d0e7765ba59e67c481a95dce7ab4c..47ba7adafba2f0eb3966dcac11b8063e3171145a 100755 (executable)
@@ -1160,7 +1160,7 @@ class P4Sync(Command):
             if [p for p in branchPrefixes if p4PathStartsWith(f['path'], p)]:
                 new_files.append (f)
             else:
-                sys.stderr.write("Ignoring file outside of prefix: %s\n" % path)
+                sys.stderr.write("Ignoring file outside of prefix: %s\n" % f['path'])
 
         self.gitStream.write("commit %s\n" % branch)
 #        gitStream.write("mark :%s\n" % details["change"])