From: Christian Couder Date: Sat, 26 Oct 2013 22:34:30 +0000 (+0200) Subject: sha1_file: move comment about return value where it belongs X-Git-Tag: v1.8.4.2~6 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3fc0dca9ceb653798377591018c81324f4d84032?ds=inline;hp=--cc sha1_file: move comment about return value where it belongs Commit 5b0864070 (sha1_object_info_extended: make type calculation optional, Jul 12 2013) changed the return value of the sha1_object_info_extended function to 0/-1 for success/error. Previously this function returned the object type for success or -1 for error. But unfortunately the above commit forgot to change or move the comment above this function that says "returns enum object_type or negative". To fix this inconsistency, let's move the comment above the sha1_object_info function where it is still true. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- 3fc0dca9ceb653798377591018c81324f4d84032 diff --git a/sha1_file.c b/sha1_file.c index 06784fb95a..613839db54 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -2444,7 +2444,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; @@ -2493,6 +2492,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;