mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with v1.8.4.2

Browse Source
This commit is contained in:
Junio C Hamano
2013-10-28 10:51:53 -07:00
parent f43bc33e44 dcb11cca50
commit cfd10568b0
4 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sha1_file.c
View File

@ -2514,7 +2514,6 @@ static int sha1_loose_object_info(const unsigned char *sha1,
return 0;
}
/* returns enum object_type or negative */
int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi)
{
struct cached_object *co;
@ -2563,6 +2562,7 @@ int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi)
return 0;
}
/* returns enum object_type or negative */
int sha1_object_info(const unsigned char *sha1, unsigned long *sizep)
{
enum object_type type;