summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorHan-Wen Nienhuys <hanwen@google.com>2007-05-23 21:49:35 (GMT)
committerHan-Wen Nienhuys <hanwen@google.com>2007-06-08 21:19:16 (GMT)
commit1b9a46849a45f2b0f58d6286957316f720a301b6 (patch)
treec6d0970728d1ee43ea4cde5d75f0647fb3191228 /contrib
parent7530a40ce2006082580865f4db6d32b956ca8dc0 (diff)
downloadgit-1b9a46849a45f2b0f58d6286957316f720a301b6.zip
git-1b9a46849a45f2b0f58d6286957316f720a301b6.tar.gz
git-1b9a46849a45f2b0f58d6286957316f720a301b6.tar.bz2
print error message when p4 print fails (eg. due to permission problems)
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/fast-import/git-p45
1 files changed, 5 insertions, 0 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index e955ad4..35c24c9 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -702,6 +702,11 @@ class P4Sync(Command):
text += filedata[j]['data']
j += 1
+
+ if not stat.has_key('depotFile'):
+ sys.stderr.write("p4 print fails with: %s\n" % repr(stat))
+ continue
+
contents[stat['depotFile']] = text
for f in files: