diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-10-28 17:51:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-28 17:51:53 (GMT) |
| commit | cfd10568b0529c74a9ab1f5baa1c7e285f898105 (patch) | |
| tree | 3729b5d08da53297c439b8c9d3ed1cd8a65e809e /sha1_file.c | |
| parent | f43bc33e4442b7a474695ea3e268b108960f7564 (diff) | |
| parent | dcb11cca50992339af744e25ca5d0f94b478d3b9 (diff) | |
| download | git-cfd10568b0529c74a9ab1f5baa1c7e285f898105.zip git-cfd10568b0529c74a9ab1f5baa1c7e285f898105.tar.gz git-cfd10568b0529c74a9ab1f5baa1c7e285f898105.tar.bz2 | |
Sync with v1.8.4.2
Diffstat (limited to 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_file.c b/sha1_file.c index f80bbe4..7dadd04 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -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; |