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

2 files changed, 10 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
diff --git a/test.sh b/test.sh
index e4ee3bb..e9c9163 100755
--- a/test.sh
+++ b/test.sh
@@ -32,3 +32,9 @@ cd fat-test2
 git fat init
 git fat pull -- 'a.fa*'
 cat a.fat
+echo 'file which is committed and removed afterwards' > d
+git add d
+git commit -m'add d with normal content'
+rm d
+git fat pull
+