Merge branch 'tk/git-svn-trim-author-name'

[thirdparty/git.git] / connected.c

diff --git a/connected.c b/connected.c
index cd9b324afa5a33be7eced6a420061905d52c211f..36c4e5dedb6a7bc76e29bc5e9f8f44f12b7c7057 100644 (file)
--- a/connected.c
+++ b/connected.c
@@ -5,6 +5,7 @@
 #include "connected.h"
 #include "transport.h"
 #include "packfile.h"
+#include "promisor-remote.h"
 
 /*
  * If we feed all the commits we want to verify to this command
@@ -28,6 +29,7 @@ int check_connected(oid_iterate_fn fn, void *cb_data,
        struct packed_git *new_pack = NULL;
        struct transport *transport;
        size_t base_len;
+       const unsigned hexsz = the_hash_algo->hexsz;
 
        if (!opt)
                opt = &defaults;
@@ -73,7 +75,7 @@ int check_connected(oid_iterate_fn fn, void *cb_data,
        argv_array_push(&rev_list.args,"rev-list");
        argv_array_push(&rev_list.args, "--objects");
        argv_array_push(&rev_list.args, "--stdin");
-       if (repository_format_partial_clone)
+       if (has_promisor_remote())
                argv_array_push(&rev_list.args, "--exclude-promisor-objects");
        if (!opt->is_deepening_fetch) {
                argv_array_push(&rev_list.args, "--not");
@@ -99,7 +101,7 @@ int check_connected(oid_iterate_fn fn, void *cb_data,
 
        sigchain_push(SIGPIPE, SIG_IGN);
 
-       commit[GIT_SHA1_HEXSZ] = '\n';
+       commit[hexsz] = '\n';
        do {
                /*
                 * If index-pack already checked that:
@@ -112,8 +114,8 @@ int check_connected(oid_iterate_fn fn, void *cb_data,
                if (new_pack && find_pack_entry_one(oid.hash, new_pack))
                        continue;
 
-               memcpy(commit, oid_to_hex(&oid), GIT_SHA1_HEXSZ);
-               if (write_in_full(rev_list.in, commit, GIT_SHA1_HEXSZ + 1) < 0) {
+               memcpy(commit, oid_to_hex(&oid), hexsz);
+               if (write_in_full(rev_list.in, commit, hexsz + 1) < 0) {
                        if (errno != EPIPE && errno != EINVAL)
                                error_errno(_("failed write to rev-list"));
                        err = -1;