[PATCH v2 1/9] fetch-object: make functions return an error code

[Christian Couder]

The callers of the fetch_object() and fetch_objects() might
be interested in knowing if these functions succeeded or not.

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org>
---
 fetch-object.c | 15 +++++++++------
 fetch-object.h |  6 +++---
 sha1-file.c    |  4 ++--
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/fetch-object.c b/fetch-object.c
index 853624f811..ccc4ea7f1a 100644
--- a/fetch-object.c
+++ b/fetch-object.c
@@ -5,11 +5,12 @@
 #include "transport.h"
 #include "fetch-object.h"
 
-static void fetch_refs(const char *remote_name, struct ref *ref)
+static int fetch_refs(const char *remote_name, struct ref *ref)
 {
        struct remote *remote;
        struct transport *transport;
        int original_fetch_if_missing = fetch_if_missing;
+       int res;
 
        fetch_if_missing = 0;
        remote = remote_get(remote_name);
@@ -19,18 +20,20 @@ static void fetch_refs(const char *remote_name, struct ref 
*ref)
 
        transport_set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
        transport_set_option(transport, TRANS_OPT_NO_DEPENDENTS, "1");
-       transport_fetch_refs(transport, ref);
+       res = transport_fetch_refs(transport, ref);
        fetch_if_missing = original_fetch_if_missing;
+
+       return res;
 }
 
-void fetch_object(const char *remote_name, const unsigned char *sha1)
+int fetch_object(const char *remote_name, const unsigned char *sha1)
 {
        struct ref *ref = alloc_ref(sha1_to_hex(sha1));
        hashcpy(ref->old_oid.hash, sha1);
-       fetch_refs(remote_name, ref);
+       return fetch_refs(remote_name, ref);
 }
 
-void fetch_objects(const char *remote_name, const struct oid_array *to_fetch)
+int fetch_objects(const char *remote_name, const struct oid_array *to_fetch)
 {
        struct ref *ref = NULL;
        int i;
@@ -41,5 +44,5 @@ void fetch_objects(const char *remote_name, const struct 
oid_array *to_fetch)
                new_ref->next = ref;
                ref = new_ref;
        }
-       fetch_refs(remote_name, ref);
+       return fetch_refs(remote_name, ref);
 }
diff --git a/fetch-object.h b/fetch-object.h
index 4b269d07ed..12e1f9ee70 100644
--- a/fetch-object.h
+++ b/fetch-object.h
@@ -3,9 +3,9 @@
 
 #include "sha1-array.h"
 
-extern void fetch_object(const char *remote_name, const unsigned char *sha1);
+extern int fetch_object(const char *remote_name, const unsigned char *sha1);
 
-extern void fetch_objects(const char *remote_name,
-                         const struct oid_array *to_fetch);
+extern int fetch_objects(const char *remote_name,
+                        const struct oid_array *to_fetch);
 
 #endif
diff --git a/sha1-file.c b/sha1-file.c
index de4839e634..c099f5584d 100644
--- a/sha1-file.c
+++ b/sha1-file.c
@@ -1312,8 +1312,8 @@ int oid_object_info_extended(struct repository *r, const 
struct object_id *oid,
                if (fetch_if_missing && repository_format_partial_clone &&
                    !already_retried && r == the_repository) {
                        /*
-                        * TODO Investigate having fetch_object() return
-                        * TODO error/success and stopping the music here.
+                        * TODO Investigate checking fetch_object() return
+                        * TODO value and stopping on error here.
                         * TODO Pass a repository struct through fetch_object,
                         * such that arbitrary repositories work.
                         */
-- 
2.18.0.138.gac082779dc