Bläddra i källkod

Ignore more special files.

Jelmer Vernooij 4 år sedan
förälder
incheckning
35f6db4ed3
2 ändrade filer med 8 tillägg och 7 borttagningar
  1. 6 6
      dulwich/index.py
  2. 2 1
      dulwich/repo.py

+ 6 - 6
dulwich/index.py

@@ -760,13 +760,13 @@ def index_entry_from_path(path, object_store=None):
                 st, head, 0, mode=S_IFGITLINK)
         return None
 
-    if stat.S_ISBLK(st.st_mode):
-        return None
+    if stat.S_ISREG(st.st_mode) or stat.S_ISLNK(st.st_mode):
+        blob = blob_from_path_and_stat(path, st)
+        if object_store is not None:
+            object_store.add_object(blob)
+        return index_entry_from_stat(st, blob.id, 0)
 
-    blob = blob_from_path_and_stat(path, st)
-    if object_store is not None:
-        object_store.add_object(blob)
-    return index_entry_from_stat(st, blob.id, 0)
+    return None
 
 
 def iter_fresh_entries(paths, root_path, object_store=None):

+ 2 - 1
dulwich/repo.py

@@ -1145,7 +1145,8 @@ class Repo(BaseRepo):
                 except KeyError:
                     pass  # already removed
             else:
-                if stat.S_ISDIR(st.st_mode) or stat.S_ISBLK(st.st_mode):
+                if (not stat.S_ISREG(st.st_mode) and
+                        not stat.S_ISLNK(st.st_mode)):
                     try:
                         del index[tree_path]
                     except KeyError: