Skip to content

Commit

Permalink
git-p4: Fix error message crash in P4Sync.commit.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tor Arvid Lund authored and Junio C Hamano committed Mar 15, 2011
1 parent d53de8b commit afa1dd9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion contrib/fast-import/git-p4
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
Expand Down

0 comments on commit afa1dd9

Please sign in to comment.