Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Mar 2013 20:52:25 +0000 (13:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Mar 2013 20:52:25 +0000 (13:52 -0700)
* maint:
Start preparing for 1.8.2.1
transport.c: help gcc 4.6.3 users by squelching compiler warning

1  2 
transport.c
diff --combined transport.c
index 6f671c65061368496d90d74a162ef6af8eb4b1fe,e6f9346c762416b9c0e97f9023062f99e4542dbc..42a61b30b3778181a06afad8afcd5bfcfc56f05a
@@@ -106,7 -106,8 +106,8 @@@ static void insert_packed_refs(const ch
                return;
  
        for (;;) {
-               int cmp, len;
+               int cmp = 0; /* assigned before used */
+               int len;
  
                if (!fgets(buffer, sizeof(buffer), f)) {
                        fclose(f);
@@@ -518,9 -519,11 +519,9 @@@ static int fetch_refs_via_pack(struct t
                               int nr_heads, struct ref **to_fetch)
  {
        struct git_transport_data *data = transport->data;
 -      struct string_list sought = STRING_LIST_INIT_DUP;
        const struct ref *refs;
        char *dest = xstrdup(transport->url);
        struct fetch_pack_args args;
 -      int i;
        struct ref *refs_tmp = NULL;
  
        memset(&args, 0, sizeof(args));
        args.no_progress = !transport->progress;
        args.depth = data->options.depth;
  
 -      for (i = 0; i < nr_heads; i++)
 -              string_list_append(&sought, to_fetch[i]->name);
 -
        if (!data->got_remote_heads) {
                connect_setup(transport, 0, 0);
                get_remote_heads(data->fd[0], &refs_tmp, 0, NULL);
  
        refs = fetch_pack(&args, data->fd, data->conn,
                          refs_tmp ? refs_tmp : transport->remote_refs,
 -                        dest, &sought, &transport->pack_lockfile);
 +                        dest, to_fetch, nr_heads,
 +                        &transport->pack_lockfile);
        close(data->fd[0]);
        close(data->fd[1]);
        if (finish_connect(data->conn))
  
        free_refs(refs_tmp);
  
 -      string_list_clear(&sought, 0);
        free(dest);
        return (refs ? 0 : -1);
  }