diff options
| author |  Tor Arvid Lund <torarvid@gmail.com> | 2011-03-15 13:08:03 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-03-15 16:07:21 -0700 |
| commit | afa1dd9a46d02a2a893840427e06fe847c8a531a (patch) | |
| tree | 63831b9cd60214e5cfbbfd11a47c9598613ac233 | |
| parent | Teach git-p4 to ignore case in perforce filenames if configured. (diff) | |
| download | tgif-afa1dd9a46d02a2a893840427e06fe847c8a531a.tar.xz | |
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>
| -rwxr-xr-x | contrib/fast-import/git-p4 | 2 |
1 files changed, 1 insertions, 1 deletions
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"]) |