Merge branch 'rr/completion-branch-config'

diff --git a/cache.h b/cache.h
index 9ba9773edfdeb0ffc543bdb3eb02ea16eee427ef..83a27269b89871b166286550ae9cb22c85dc7d10 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1080,6 +1080,7 @@ struct object_info {
        enum object_type *typep;
        unsigned long *sizep;
        unsigned long *disk_sizep;
+       unsigned char *delta_base_sha1;
 
        /* Response */
        enum {