浏览代码

Don't include lower part of flags in index interface.

Jelmer Vernooij 16 年之前
父节点
当前提交
4e16bd19a5
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      dulwich/index.py
  2. 2 2
      dulwich/tests/test_index.py

+ 1 - 1
dulwich/index.py

@@ -66,7 +66,7 @@ def read_cache_entry(f):
     real_size = ((f.tell() - beginoffset + 8) & ~7)
     data = f.read((beginoffset + real_size) - f.tell())
     return (name, ctime, mtime, dev, ino, mode, uid, gid, size, 
-            sha_to_hex(sha), flags)
+            sha_to_hex(sha), flags & ~0x0fff)
 
 
 def write_cache_entry(f, entry):

+ 2 - 2
dulwich/tests/test_index.py

@@ -50,7 +50,7 @@ class SimpleIndexTestcase(IndexTestCase):
         self.assertEquals(['bla'], list(self.get_simple_index("index")))
 
     def test_getitem(self):
-        self.assertEquals( ((1230680220, 0), (1230680220, 0), 2050, 3761020, 33188, 1000, 1000, 0, 'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391', 3)
+        self.assertEquals( ((1230680220, 0), (1230680220, 0), 2050, 3761020, 33188, 1000, 1000, 0, 'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391', 0)
             , 
                 self.get_simple_index("index")["bla"])
 
@@ -58,7 +58,7 @@ class SimpleIndexTestcase(IndexTestCase):
 class SimpleIndexWriterTestCase(IndexTestCase):
 
     def test_simple_write(self):
-        entries = [('barbla', (1230680220, 0), (1230680220, 0), 2050, 3761020, 33188, 1000, 1000, 0, 'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391', 3)]
+        entries = [('barbla', (1230680220, 0), (1230680220, 0), 2050, 3761020, 33188, 1000, 1000, 0, 'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391', 0)]
         x = open('test-simple-write-index', 'w+')
         try:
             write_index(x, entries)