From: Tor Arvid Lund <torarvid@gmail.com>
Date: Tue, 15 Mar 2011 12:08:03 +0000 (+0100)
Subject: git-p4: Fix error message crash in P4Sync.commit.
X-Git-Tag: v1.7.5-rc0~38^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/afa1dd9a46d02a2a893840427e06fe847c8a531a?hp=--cc

git-p4: Fix error message crash in P4Sync.commit.

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>
---

afa1dd9a46d02a2a893840427e06fe847c8a531a
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index d47596f328..47ba7adafb 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -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"])