[PATCH 3/3] git-p4: Fix error message crash in P4Sync.commit.
- From
Tor Arvid Lund <torarvid@gmail.com>
- Date
- Mar 15, 2011, 12:08 UTC
- Message-ID
- <1300190883-31833-3-git-send-email-torarvid@gmail.com>
- In-Reply-To
- <1300190883-31833-1-git-send-email-torarvid@gmail.com>
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> --- 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 d47596f..47ba7ad 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"])
-- 1.7.3.1.68.g06779.dirty