summaryrefslogtreecommitdiff
path: root/git-fat
diff options
context:
space:
mode:
authorJed Brown <jed@59A2.org>2014-05-09 09:48:59 -0500
committerJed Brown <jed@59A2.org>2014-05-09 09:48:59 -0500
commit456d22cb3c7ba60e15d5d0f7de771c2acf573481 (patch)
treee35ea81253535eb92d915aa2b541bb3274e5ede2 /git-fat
parent0f6c2802a97cb32d7541b2007804501c57810a05 (diff)
parent3273f6b4c5390e2f3de56e9ec015184f32d10588 (diff)
downloadgit-fat-456d22cb3c7ba60e15d5d0f7de771c2acf573481.tar.gz
Merge branch 'fix-OSError-on-removed-tracked-file' of github:cspurk/git-fat (PR #30)
* 'fix-OSError-on-removed-tracked-file' of github:cspurk/git-fat: fix OSError on “git fat pull” with manually removed, tracked files in WC
Diffstat (limited to 'git-fat')
-rwxr-xr-xgit-fat5
1 files changed, 4 insertions, 1 deletions
diff --git a/git-fat b/git-fat
index 82b2754..97315ea 100755
--- a/git-fat
+++ b/git-fat
@@ -195,7 +195,10 @@ class GitFat(object):
return itertools.chain([preamble], readblocks(stream)), None
def decode_file(self, fname):
# Fast check
- stat = os.lstat(fname)
+ try:
+ stat = os.lstat(fname)
+ except OSError:
+ return False, None
if stat.st_size != self.magiclen:
return False, None
# read file