builtin / fetch-pack.con commit worktree: fix "add -B" (0ebf4a2)
   1#include "builtin.h"
   2#include "pkt-line.h"
   3#include "fetch-pack.h"
   4#include "remote.h"
   5#include "connect.h"
   6#include "sha1-array.h"
   7
   8static const char fetch_pack_usage[] =
   9"git fetch-pack [--all] [--stdin] [--quiet | -q] [--keep | -k] [--thin] "
  10"[--include-tag] [--upload-pack=<git-upload-pack>] [--depth=<n>] "
  11"[--no-progress] [--diag-url] [-v] [<host>:]<directory> [<refs>...]";
  12
  13static void add_sought_entry_mem(struct ref ***sought, int *nr, int *alloc,
  14                                 const char *name, int namelen)
  15{
  16        struct ref *ref = xcalloc(1, sizeof(*ref) + namelen + 1);
  17        struct object_id oid;
  18        const int chunksz = GIT_SHA1_HEXSZ + 1;
  19
  20        if (namelen > chunksz && name[chunksz - 1] == ' ' &&
  21                !get_oid_hex(name, &oid)) {
  22                oidcpy(&ref->old_oid, &oid);
  23                name += chunksz;
  24                namelen -= chunksz;
  25        }
  26
  27        memcpy(ref->name, name, namelen);
  28        ref->name[namelen] = '\0';
  29        (*nr)++;
  30        ALLOC_GROW(*sought, *nr, *alloc);
  31        (*sought)[*nr - 1] = ref;
  32}
  33
  34static void add_sought_entry(struct ref ***sought, int *nr, int *alloc,
  35                             const char *string)
  36{
  37        add_sought_entry_mem(sought, nr, alloc, string, strlen(string));
  38}
  39
  40int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
  41{
  42        int i, ret;
  43        struct ref *ref = NULL;
  44        const char *dest = NULL;
  45        struct ref **sought = NULL;
  46        int nr_sought = 0, alloc_sought = 0;
  47        int fd[2];
  48        char *pack_lockfile = NULL;
  49        char **pack_lockfile_ptr = NULL;
  50        struct child_process *conn;
  51        struct fetch_pack_args args;
  52        struct sha1_array shallow = SHA1_ARRAY_INIT;
  53
  54        packet_trace_identity("fetch-pack");
  55
  56        memset(&args, 0, sizeof(args));
  57        args.uploadpack = "git-upload-pack";
  58
  59        for (i = 1; i < argc && *argv[i] == '-'; i++) {
  60                const char *arg = argv[i];
  61
  62                if (starts_with(arg, "--upload-pack=")) {
  63                        args.uploadpack = arg + 14;
  64                        continue;
  65                }
  66                if (starts_with(arg, "--exec=")) {
  67                        args.uploadpack = arg + 7;
  68                        continue;
  69                }
  70                if (!strcmp("--quiet", arg) || !strcmp("-q", arg)) {
  71                        args.quiet = 1;
  72                        continue;
  73                }
  74                if (!strcmp("--keep", arg) || !strcmp("-k", arg)) {
  75                        args.lock_pack = args.keep_pack;
  76                        args.keep_pack = 1;
  77                        continue;
  78                }
  79                if (!strcmp("--thin", arg)) {
  80                        args.use_thin_pack = 1;
  81                        continue;
  82                }
  83                if (!strcmp("--include-tag", arg)) {
  84                        args.include_tag = 1;
  85                        continue;
  86                }
  87                if (!strcmp("--all", arg)) {
  88                        args.fetch_all = 1;
  89                        continue;
  90                }
  91                if (!strcmp("--stdin", arg)) {
  92                        args.stdin_refs = 1;
  93                        continue;
  94                }
  95                if (!strcmp("--diag-url", arg)) {
  96                        args.diag_url = 1;
  97                        continue;
  98                }
  99                if (!strcmp("-v", arg)) {
 100                        args.verbose = 1;
 101                        continue;
 102                }
 103                if (starts_with(arg, "--depth=")) {
 104                        args.depth = strtol(arg + 8, NULL, 0);
 105                        continue;
 106                }
 107                if (!strcmp("--no-progress", arg)) {
 108                        args.no_progress = 1;
 109                        continue;
 110                }
 111                if (!strcmp("--stateless-rpc", arg)) {
 112                        args.stateless_rpc = 1;
 113                        continue;
 114                }
 115                if (!strcmp("--lock-pack", arg)) {
 116                        args.lock_pack = 1;
 117                        pack_lockfile_ptr = &pack_lockfile;
 118                        continue;
 119                }
 120                if (!strcmp("--check-self-contained-and-connected", arg)) {
 121                        args.check_self_contained_and_connected = 1;
 122                        continue;
 123                }
 124                if (!strcmp("--cloning", arg)) {
 125                        args.cloning = 1;
 126                        continue;
 127                }
 128                if (!strcmp("--update-shallow", arg)) {
 129                        args.update_shallow = 1;
 130                        continue;
 131                }
 132                usage(fetch_pack_usage);
 133        }
 134
 135        if (i < argc)
 136                dest = argv[i++];
 137        else
 138                usage(fetch_pack_usage);
 139
 140        /*
 141         * Copy refs from cmdline to growable list, then append any
 142         * refs from the standard input:
 143         */
 144        for (; i < argc; i++)
 145                add_sought_entry(&sought, &nr_sought, &alloc_sought, argv[i]);
 146        if (args.stdin_refs) {
 147                if (args.stateless_rpc) {
 148                        /* in stateless RPC mode we use pkt-line to read
 149                         * from stdin, until we get a flush packet
 150                         */
 151                        for (;;) {
 152                                char *line = packet_read_line(0, NULL);
 153                                if (!line)
 154                                        break;
 155                                add_sought_entry(&sought, &nr_sought,  &alloc_sought, line);
 156                        }
 157                }
 158                else {
 159                        /* read from stdin one ref per line, until EOF */
 160                        struct strbuf line = STRBUF_INIT;
 161                        while (strbuf_getline_lf(&line, stdin) != EOF)
 162                                add_sought_entry(&sought, &nr_sought, &alloc_sought, line.buf);
 163                        strbuf_release(&line);
 164                }
 165        }
 166
 167        if (args.stateless_rpc) {
 168                conn = NULL;
 169                fd[0] = 0;
 170                fd[1] = 1;
 171        } else {
 172                int flags = args.verbose ? CONNECT_VERBOSE : 0;
 173                if (args.diag_url)
 174                        flags |= CONNECT_DIAG_URL;
 175                conn = git_connect(fd, dest, args.uploadpack,
 176                                   flags);
 177                if (!conn)
 178                        return args.diag_url ? 0 : 1;
 179        }
 180        get_remote_heads(fd[0], NULL, 0, &ref, 0, NULL, &shallow);
 181
 182        ref = fetch_pack(&args, fd, conn, ref, dest, sought, nr_sought,
 183                         &shallow, pack_lockfile_ptr);
 184        if (pack_lockfile) {
 185                printf("lock %s\n", pack_lockfile);
 186                fflush(stdout);
 187        }
 188        if (args.check_self_contained_and_connected &&
 189            args.self_contained_and_connected) {
 190                printf("connectivity-ok\n");
 191                fflush(stdout);
 192        }
 193        close(fd[0]);
 194        close(fd[1]);
 195        if (finish_connect(conn))
 196                return 1;
 197
 198        ret = !ref;
 199
 200        /*
 201         * If the heads to pull were given, we should have consumed
 202         * all of them by matching the remote.  Otherwise, 'git fetch
 203         * remote no-such-ref' would silently succeed without issuing
 204         * an error.
 205         */
 206        for (i = 0; i < nr_sought; i++) {
 207                if (!sought[i] || sought[i]->matched)
 208                        continue;
 209                error("no such remote ref %s", sought[i]->name);
 210                ret = 1;
 211        }
 212
 213        while (ref) {
 214                printf("%s %s\n",
 215                       oid_to_hex(&ref->old_oid), ref->name);
 216                ref = ref->next;
 217        }
 218
 219        return ret;
 220}