Merge tag 'l10n-2.7.0-rnd2+de' of git://github.com/git-l10n/git-po

diff --git a/object.h b/object.h
index 6416247defa133c5c7ca43c69dfe09ae00ac03f7..f8b644263ff7e3b244bc1804b8527f87f7dbcf84 100644 (file)
--- a/object.h
+++ b/object.h
@@ -49,7 +49,7 @@ struct object {
        unsigned used : 1;
        unsigned type : TYPE_BITS;
        unsigned flags : FLAG_BITS;
-       unsigned char sha1[20];
+       struct object_id oid;
 };
 
 extern const char *typename(unsigned int type);