t5702: use test_commit_bulk

diff --git a/upload-pack.c b/upload-pack.c
index 0c1feccaabac10fcb26828e0265f5aa053952253..4d2129e7fc134cdbc67e08ce9fb4f805023059b5 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -43,7 +43,6 @@
 
 static timestamp_t oldest_have;
 
-static int deepen_relative;
 static int multi_ack;
 static int no_done;
 static int use_thin_pack, use_ofs_delta, use_include_tag;
@@ -142,14 +141,17 @@ static void create_pack_file(const struct object_array *have_obj,
        if (use_include_tag)
                argv_array_push(&pack_objects.args, "--include-tag");
        if (filter_options.filter_spec) {
+               struct strbuf expanded_filter_spec = STRBUF_INIT;
+               expand_list_objects_filter_spec(&filter_options,
+                                               &expanded_filter_spec);
                if (pack_objects.use_shell) {
                        struct strbuf buf = STRBUF_INIT;
-                       sq_quote_buf(&buf, filter_options.filter_spec);
+                       sq_quote_buf(&buf, expanded_filter_spec.buf);
                        argv_array_pushf(&pack_objects.args, "--filter=%s", buf.buf);
                        strbuf_release(&buf);
                } else {
                        argv_array_pushf(&pack_objects.args, "--filter=%s",
-                                        filter_options.filter_spec);
+                                        expanded_filter_spec.buf);
                }
        }
 
@@ -590,7 +592,8 @@ static int has_unreachable(struct object_array *src)
        return 1;
 }
 
-static void check_non_tip(struct object_array *want_obj)
+static void check_non_tip(struct object_array *want_obj,
+                         struct packet_writer *writer)
 {
        int i;
 
@@ -609,9 +612,13 @@ static void check_non_tip(struct object_array *want_obj)
        /* Pick one of them (we know there at least is one) */
        for (i = 0; i < want_obj->nr; i++) {
                struct object *o = want_obj->objects[i].item;
-               if (!is_our_ref(o))
+               if (!is_our_ref(o)) {
+                       packet_writer_error(writer,
+                                           "upload-pack: not our ref %s",
+                                           oid_to_hex(&o->oid));
                        die("git upload-pack: not our ref %s",
                            oid_to_hex(&o->oid));
+               }
        }
 }
 
@@ -666,6 +673,8 @@ static void send_unshallow(struct packet_writer *writer,
        }
 }
 
+static int check_ref(const char *refname_full, const struct object_id *oid,
+                    int flag, void *cb_data);
 static void deepen(struct packet_writer *writer, int depth, int deepen_relative,
                   struct object_array *shallows, struct object_array *want_obj)
 {
@@ -680,6 +689,13 @@ static void deepen(struct packet_writer *writer, int depth, int deepen_relative,
                struct object_array reachable_shallows = OBJECT_ARRAY_INIT;
                struct commit_list *result;
 
+               /*
+                * Checking for reachable shallows requires that our refs be
+                * marked with OUR_REF.
+                */
+               head_ref_namespaced(check_ref, NULL);
+               for_each_namespaced_ref(check_ref, NULL);
+
                get_reachable_list(shallows, &reachable_shallows);
                result = get_shallow_commits(&reachable_shallows,
                                             depth + 1,
@@ -718,6 +734,7 @@ static int send_shallow_list(struct packet_writer *writer,
                             int depth, int deepen_rev_list,
                             timestamp_t deepen_since,
                             struct string_list *deepen_not,
+                            int deepen_relative,
                             struct object_array *shallows,
                             struct object_array *want_obj)
 {
@@ -822,7 +839,7 @@ static int process_deepen_not(const char *line, struct string_list *deepen_not,
        if (skip_prefix(line, "deepen-not ", &arg)) {
                char *ref = NULL;
                struct object_id oid;
-               if (expand_ref(arg, strlen(arg), &oid, &ref) != 1)
+               if (expand_ref(the_repository, arg, strlen(arg), &oid, &ref) != 1)
                        die("git upload-pack: ambiguous deepen-not: %s", line);
                string_list_append(deepen_not, ref);
                free(ref);
@@ -840,6 +857,7 @@ static void receive_needs(struct packet_reader *reader, struct object_array *wan
        int has_non_tip = 0;
        timestamp_t deepen_since = 0;
        int deepen_rev_list = 0;
+       int deepen_relative = 0;
        struct packet_writer writer;
 
        shallow_nr = 0;
@@ -923,7 +941,7 @@ static void receive_needs(struct packet_reader *reader, struct object_array *wan
         * by another process that handled the initial request.
         */
        if (has_non_tip)
-               check_non_tip(want_obj);
+               check_non_tip(want_obj, &writer);
 
        if (!use_sideband && daemon_mode)
                no_progress = 1;
@@ -932,7 +950,8 @@ static void receive_needs(struct packet_reader *reader, struct object_array *wan
                return;
 
        if (send_shallow_list(&writer, depth, deepen_rev_list, deepen_since,
-                             &deepen_not, &shallows, want_obj))
+                             &deepen_not, deepen_relative, &shallows,
+                             want_obj))
                packet_flush(1);
        object_array_clear(&shallows);
 }
@@ -1018,8 +1037,8 @@ static int find_symref(const char *refname, const struct object_id *oid,
        symref_target = resolve_ref_unsafe(refname, 0, NULL, &flag);
        if (!symref_target || (flag & REF_ISSYMREF) == 0)
                die("'%s' is a symref but it is not?", refname);
-       item = string_list_append(cb_data, refname);
-       item->util = xstrdup(symref_target);
+       item = string_list_append(cb_data, strip_namespace(refname));
+       item->util = xstrdup(strip_namespace(symref_target));
        return 0;
 }
 
@@ -1050,6 +1069,8 @@ static int upload_pack_config(const char *var, const char *value, void *unused)
                allow_ref_in_want = git_config_bool(var, value);
        } else if (!strcmp("uploadpack.allowsidebandall", var)) {
                allow_sideband_all = git_config_bool(var, value);
+       } else if (!strcmp("core.precomposeunicode", var)) {
+               precomposed_unicode = git_config_bool(var, value);
        }
 
        if (current_config_scope() != CONFIG_SCOPE_REPO) {
@@ -1421,6 +1442,7 @@ static void send_shallow_info(struct upload_pack_data *data,
        if (!send_shallow_list(&data->writer, data->depth,
                               data->deepen_rev_list,
                               data->deepen_since, &data->deepen_not,
+                              data->deepen_relative,
                               &data->shallows, want_obj) &&
            is_repository_shallow(the_repository))
                deepen(&data->writer, INFINITE_DEPTH, data->deepen_relative,