summaryrefslogtreecommitdiff
path: root/git-fat
diff options
context:
space:
mode:
authorJed Brown <jed@59A2.org>2012-12-24 16:13:28 -0600
committerJed Brown <jed@59A2.org>2012-12-24 16:13:28 -0600
commit3767f3a60c00d67af42c820a86958e98213b999b (patch)
tree09a43984fdf1cd346af4f912b997eedc59ba9dbe /git-fat
parente8aa02c259b9cd22768d17f2307d0212118d59d8 (diff)
downloadgit-fat-3767f3a60c00d67af42c820a86958e98213b999b.tar.gz
Skip files matching magiclen that fail to decode (they are not managed by us)
Diffstat (limited to 'git-fat')
-rwxr-xr-xgit-fat7
1 files changed, 5 insertions, 2 deletions
diff --git a/git-fat b/git-fat
index 824f394..987780c 100755
--- a/git-fat
+++ b/git-fat
@@ -204,8 +204,11 @@ class GitFat(object):
for line in p2.stdout:
objhash, objtype, size = line.split()
if objtype == 'blob' and int(size) in self.magiclens:
- fathash = self.decode(subprocess.check_output(['git', 'cat-file', '-p', objhash]))[0]
- referenced.add(fathash)
+ try:
+ fathash = self.decode(subprocess.check_output(['git', 'cat-file', '-p', objhash]))[0]
+ referenced.add(fathash)
+ except GitFat.DecodeError:
+ pass
cut_thread.join()
p1.wait()
p2.wait()