diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2013-10-27 00:34:30 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-28 09:07:01 -0700 |
| commit | 3fc0dca9ceb653798377591018c81324f4d84032 (patch) | |
| tree | cf4a8eb355f2a3bb4c96f5cf5b39e3c50ab35edc /merge-recursive.c | |
| parent | ca462804c68b5ac0936242d4938fc9273b00180d (diff) | |
| download | git-3fc0dca9ceb653798377591018c81324f4d84032.tar.gz git-3fc0dca9ceb653798377591018c81324f4d84032.tar.xz | |
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 <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions