Make fetch a builtin
Thanks to Johannes Schindelin for review and fixes, and Julian Phillips for the original C translation. This changes a few small bits of behavior: branch.<name>.merge is parsed as if it were the lhs of a fetch refspec, and does not have to exactly match the actual lhs of a refspec, so long as it is a valid abbreviation for the same ref. branch.<name>.merge is no longer ignored if the remote is configured with a branches/* file. Neither behavior is useful, because there can only be one ref that gets fetched, but this is more consistant. Also, fetch prints different information to standard out. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Daniel Barkalow committed
Sep 10, 2007 at 23:03 UTC
b888d61c8308027433df9c243fa551f42db1c76a
17 files changed
+571
-15
Documentation/config.txt
+5
-4
@@ -324,10 +324,11 @@ branch.<name>.remote::
324
If this option is not given, `git fetch` defaults to remote "origin".
325
326
branch.<name>.merge::
327
- When in branch <name>, it tells `git fetch` the default refspec to
328
- be marked for merging in FETCH_HEAD. The value has exactly to match
329
- a remote part of one of the refspecs which are fetched from the remote
330
- given by "branch.<name>.remote".
327
+ When in branch <name>, it tells `git fetch` the default
328
+ refspec to be marked for merging in FETCH_HEAD. The value is
329
+ handled like the remote part of a refspec, and must match a
330
+ ref which is fetched from the remote given by
331
+ "branch.<name>.remote".
332
The merge information is used by `git pull` (which at first calls
333
`git fetch`) to lookup the default branch for merging. Without
334
this option, `git pull` defaults to merge the first refspec fetched.
Makefile
+1
-1
@@ -207,7 +207,6 @@ BASIC_LDFLAGS =
207
SCRIPT_SH = \
208
git-bisect.sh git-checkout.sh \
209
git-clean.sh git-clone.sh git-commit.sh \
210
- git-fetch.sh \
210
git-ls-remote.sh \
211
git-merge-one-file.sh git-mergetool.sh git-parse-remote.sh \
212
git-pull.sh git-rebase.sh git-rebase--interactive.sh \
@@ -332,6 +331,7 @@ BUILTIN_OBJS = \
331
builtin-diff-files.o \
332
builtin-diff-index.o \
333
builtin-diff-tree.o \
334
+ builtin-fetch.o \
335
builtin-fetch-pack.o \
336
builtin-fetch--tool.o \
337
builtin-fmt-merge-msg.o \
builtin-fetch.c
new
+552
@@ -0,0 +1,552 @@
1
+/*
2
+ * "git fetch"
3
+ */
4
+#include "cache.h"
5
+#include "refs.h"
6
+#include "commit.h"
7
+#include "builtin.h"
8
+#include "path-list.h"
9
+#include "remote.h"
10
+#include "transport.h"
11
+
12
+static const char fetch_usage[] = "git-fetch [-a | --append] [--upload-pack <upload-pack>] [-f | --force] [--no-tags] [-t | --tags] [-k | --keep] [-u | --update-head-ok] [--depth <depth>] [-v | --verbose] [<repository> <refspec>...]";
13
+
14
+static int append, force, tags, no_tags, update_head_ok, verbose, quiet;
15
+
16
+static int unpacklimit;
17
+
18
+static char *default_rla = NULL;
19
+
20
+static void find_merge_config(struct ref *ref_map, struct remote *remote)
21
+{
22
+ struct ref *rm = ref_map;
23
+ struct branch *branch = branch_get(NULL);
24
+
25
+ for (rm = ref_map; rm; rm = rm->next) {
26
+ if (!branch_has_merge_config(branch)) {
27
+ if (remote && remote->fetch &&
28
+ !strcmp(remote->fetch[0].src, rm->name))
29
+ rm->merge = 1;
30
+ } else {
31
+ if (branch_merges(branch, rm->name))
32
+ rm->merge = 1;
33
+ }
34
+ }
35
+}
36
+
37
+static struct ref *get_ref_map(struct transport *transport,
38
+ struct refspec *refs, int ref_count, int tags,
39
+ int *autotags)
40
+{
41
+ int i;
42
+ struct ref *rm;
43
+ struct ref *ref_map = NULL;
44
+ struct ref **tail = &ref_map;
45
+
46
+ struct ref *remote_refs = transport_get_remote_refs(transport);
47
+
48
+ if (ref_count || tags) {
49
+ for (i = 0; i < ref_count; i++) {
50
+ get_fetch_map(remote_refs, &refs[i], &tail);
51
+ if (refs[i].dst && refs[i].dst[0])
52
+ *autotags = 1;
53
+ }
54
+ /* Merge everything on the command line, but not --tags */
55
+ for (rm = ref_map; rm; rm = rm->next)
56
+ rm->merge = 1;
57
+ if (tags) {
58
+ struct refspec refspec;
59
+ refspec.src = "refs/tags/";
60
+ refspec.dst = "refs/tags/";
61
+ refspec.pattern = 1;
62
+ refspec.force = 0;
63
+ get_fetch_map(remote_refs, &refspec, &tail);
64
+ }
65
+ } else {
66
+ /* Use the defaults */
67
+ struct remote *remote = transport->remote;
68
+ if (remote->fetch_refspec_nr) {
69
+ for (i = 0; i < remote->fetch_refspec_nr; i++) {
70
+ get_fetch_map(remote_refs, &remote->fetch[i], &tail);
71
+ if (remote->fetch[i].dst &&
72
+ remote->fetch[i].dst[0])
73
+ *autotags = 1;
74
+ }
75
+ find_merge_config(ref_map, remote);
76
+ } else {
77
+ ref_map = get_remote_ref(remote_refs, "HEAD");
78
+
79
+ ref_map->merge = 1;
80
+ }
81
+ }
82
+
83
+ return ref_map;
84
+}
85
+
86
+static void show_new(enum object_type type, unsigned char *sha1_new)
87
+{
88
+ fprintf(stderr, " %s: %s\n", typename(type),
89
+ find_unique_abbrev(sha1_new, DEFAULT_ABBREV));
90
+}
91
+
92
+static int s_update_ref(const char *action,
93
+ struct ref *ref,
94
+ int check_old)
95
+{
96
+ char msg[1024];
97
+ char *rla = getenv("GIT_REFLOG_ACTION");
98
+ static struct ref_lock *lock;
99
+
100
+ if (!rla)
101
+ rla = default_rla;
102
+ snprintf(msg, sizeof(msg), "%s: %s", rla, action);
103
+ lock = lock_any_ref_for_update(ref->name,
104
+ check_old ? ref->old_sha1 : NULL, 0);
105
+ if (!lock)
106
+ return 1;
107
+ if (write_ref_sha1(lock, ref->new_sha1, msg) < 0)
108
+ return 1;
109
+ return 0;
110
+}
111
+
112
+static int update_local_ref(struct ref *ref,
113
+ const char *note,
114
+ int verbose)
115
+{
116
+ char oldh[41], newh[41];
117
+ struct commit *current = NULL, *updated;
118
+ enum object_type type;
119
+ struct branch *current_branch = branch_get(NULL);
120
+
121
+ type = sha1_object_info(ref->new_sha1, NULL);
122
+ if (type < 0)
123
+ die("object %s not found", sha1_to_hex(ref->new_sha1));
124
+
125
+ if (!*ref->name) {
126
+ /* Not storing */
127
+ if (verbose) {
128
+ fprintf(stderr, "* fetched %s\n", note);
129
+ show_new(type, ref->new_sha1);
130
+ }
131
+ return 0;
132
+ }
133
+
134
+ if (!hashcmp(ref->old_sha1, ref->new_sha1)) {
135
+ if (verbose) {
136
+ fprintf(stderr, "* %s: same as %s\n",
137
+ ref->name, note);
138
+ show_new(type, ref->new_sha1);
139
+ }
140
+ return 0;
141
+ }
142
+
143
+ if (!strcmp(ref->name, current_branch->name) &&
144
+ !(update_head_ok || is_bare_repository()) &&
145
+ !is_null_sha1(ref->old_sha1)) {
146
+ /*
147
+ * If this is the head, and it's not okay to update
148
+ * the head, and the old value of the head isn't empty...
149
+ */
150
+ fprintf(stderr,
151
+ " * %s: Cannot fetch into the current branch.\n",
152
+ ref->name);
153
+ return 1;
154
+ }
155
+
156
+ if (!is_null_sha1(ref->old_sha1) &&
157
+ !prefixcmp(ref->name, "refs/tags/")) {
158
+ fprintf(stderr, "* %s: updating with %s\n",
159
+ ref->name, note);
160
+ show_new(type, ref->new_sha1);
161
+ return s_update_ref("updating tag", ref, 0);
162
+ }
163
+
164
+ current = lookup_commit_reference(ref->old_sha1);
165
+ updated = lookup_commit_reference(ref->new_sha1);
166
+ if (!current || !updated) {
167
+ char *msg;
168
+ if (!strncmp(ref->name, "refs/tags/", 10))
169
+ msg = "storing tag";
170
+ else
171
+ msg = "storing head";
172
+ fprintf(stderr, "* %s: storing %s\n",
173
+ ref->name, note);
174
+ show_new(type, ref->new_sha1);
175
+ return s_update_ref(msg, ref, 0);
176
+ }
177
+
178
+ strcpy(oldh, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV));
179
+ strcpy(newh, find_unique_abbrev(ref->new_sha1, DEFAULT_ABBREV));
180
+
181
+ if (in_merge_bases(current, &updated, 1)) {
182
+ fprintf(stderr, "* %s: fast forward to %s\n",
183
+ ref->name, note);
184
+ fprintf(stderr, " old..new: %s..%s\n", oldh, newh);
185
+ return s_update_ref("fast forward", ref, 1);
186
+ }
187
+ if (!force && !ref->force) {
188
+ fprintf(stderr,
189
+ "* %s: not updating to non-fast forward %s\n",
190
+ ref->name, note);
191
+ fprintf(stderr,
192
+ " old...new: %s...%s\n", oldh, newh);
193
+ return 1;
194
+ }
195
+ fprintf(stderr,
196
+ "* %s: forcing update to non-fast forward %s\n",
197
+ ref->name, note);
198
+ fprintf(stderr, " old...new: %s...%s\n", oldh, newh);
199
+ return s_update_ref("forced-update", ref, 1);
200
+}
201
+
202
+static void store_updated_refs(const char *url, struct ref *ref_map)
203
+{
204
+ FILE *fp;
205
+ struct commit *commit;
206
+ int url_len, i, note_len;
207
+ char note[1024];
208
+ const char *what, *kind;
209
+ struct ref *rm;
210
+
211
+ fp = fopen(git_path("FETCH_HEAD"), "a");
212
+ for (rm = ref_map; rm; rm = rm->next) {
213
+ struct ref *ref = NULL;
214
+
215
+ if (rm->peer_ref) {
216
+ ref = xcalloc(1, sizeof(*ref) + strlen(rm->peer_ref->name) + 1);
217
+ strcpy(ref->name, rm->peer_ref->name);
218
+ hashcpy(ref->old_sha1, rm->peer_ref->old_sha1);
219
+ hashcpy(ref->new_sha1, rm->old_sha1);
220
+ ref->force = rm->force;
221
+ }
222
+
223
+ commit = lookup_commit_reference(rm->old_sha1);
224
+ if (!commit)
225
+ rm->merge = 0;
226
+
227
+ if (!strcmp(rm->name, "HEAD")) {
228
+ kind = "";
229
+ what = "";
230
+ }
231
+ else if (!prefixcmp(rm->name, "refs/heads/")) {
232
+ kind = "branch";
233
+ what = rm->name + 11;
234
+ }
235
+ else if (!prefixcmp(rm->name, "refs/tags/")) {
236
+ kind = "tag";
237
+ what = rm->name + 10;
238
+ }
239
+ else if (!prefixcmp(rm->name, "refs/remotes/")) {
240
+ kind = "remote branch";
241
+ what = rm->name + 13;
242
+ }
243
+ else {
244
+ kind = "";
245
+ what = rm->name;
246
+ }
247
+
248
+ url_len = strlen(url);
249
+ for (i = url_len - 1; url[i] == '/' && 0 <= i; i--)
250
+ ;
251
+ url_len = i + 1;
252
+ if (4 < i && !strncmp(".git", url + i - 3, 4))
253
+ url_len = i - 3;
254
+
255
+ note_len = 0;
256
+ if (*what) {
257
+ if (*kind)
258
+ note_len += sprintf(note + note_len, "%s ",
259
+ kind);
260
+ note_len += sprintf(note + note_len, "'%s' of ", what);
261
+ }
262
+ note_len += sprintf(note + note_len, "%.*s", url_len, url);
263
+ fprintf(fp, "%s\t%s\t%s\n",
264
+ sha1_to_hex(commit ? commit->object.sha1 :
265
+ rm->old_sha1),
266
+ rm->merge ? "" : "not-for-merge",
267
+ note);
268
+
269
+ if (ref)
270
+ update_local_ref(ref, note, verbose);
271
+ }
272
+ fclose(fp);
273
+}
274
+
275
+static int fetch_refs(struct transport *transport, struct ref *ref_map)
276
+{
277
+ int ret = transport_fetch_refs(transport, ref_map);
278
+ if (!ret)
279
+ store_updated_refs(transport->url, ref_map);
280
+ return ret;
281
+}
282
+
283
+static int add_existing(const char *refname, const unsigned char *sha1,
284
+ int flag, void *cbdata)
285
+{
286
+ struct path_list *list = (struct path_list *)cbdata;
287
+ path_list_insert(refname, list);
288
+ return 0;
289
+}
290
+
291
+static struct ref *find_non_local_tags(struct transport *transport,
292
+ struct ref *fetch_map)
293
+{
294
+ static struct path_list existing_refs = { NULL, 0, 0, 0 };
295
+ struct path_list new_refs = { NULL, 0, 0, 1 };
296
+ char *ref_name;
297
+ int ref_name_len;
298
+ unsigned char *ref_sha1;
299
+ struct ref *tag_ref;
300
+ struct ref *rm = NULL;
301
+ struct ref *ref_map = NULL;
302
+ struct ref **tail = &ref_map;
303
+ struct ref *ref;
304
+
305
+ for_each_ref(add_existing, &existing_refs);
306
+ for (ref = transport_get_remote_refs(transport); ref; ref = ref->next) {
307
+ if (prefixcmp(ref->name, "refs/tags"))
308
+ continue;
309
+
310
+ ref_name = xstrdup(ref->name);
311
+ ref_name_len = strlen(ref_name);
312
+ ref_sha1 = ref->old_sha1;
313
+
314
+ if (!strcmp(ref_name + ref_name_len - 3, "^{}")) {
315
+ ref_name[ref_name_len - 3] = 0;
316
+ tag_ref = transport_get_remote_refs(transport);
317
+ while (tag_ref) {
318
+ if (!strcmp(tag_ref->name, ref_name)) {
319
+ ref_sha1 = tag_ref->old_sha1;
320
+ break;
321
+ }
322
+ tag_ref = tag_ref->next;
323
+ }
324
+ }
325
+
326
+ if (!path_list_has_path(&existing_refs, ref_name) &&
327
+ !path_list_has_path(&new_refs, ref_name) &&
328
+ lookup_object(ref->old_sha1)) {
329
+ fprintf(stderr, "Auto-following %s\n",
330
+ ref_name);
331
+
332
+ path_list_insert(ref_name, &new_refs);
333
+
334
+ rm = alloc_ref(strlen(ref_name) + 1);
335
+ strcpy(rm->name, ref_name);
336
+ rm->peer_ref = alloc_ref(strlen(ref_name) + 1);
337
+ strcpy(rm->peer_ref->name, ref_name);
338
+ hashcpy(rm->old_sha1, ref_sha1);
339
+
340
+ *tail = rm;
341
+ tail = &rm->next;
342
+ }
343
+ free(ref_name);
344
+ }
345
+
346
+ return ref_map;
347
+}
348
+
349
+static int do_fetch(struct transport *transport,
350
+ struct refspec *refs, int ref_count)
351
+{
352
+ struct ref *ref_map, *fetch_map;
353
+ struct ref *rm;
354
+ int autotags = (transport->remote->fetch_tags == 1);
355
+ if (transport->remote->fetch_tags == 2 && !no_tags)
356
+ tags = 1;
357
+ if (transport->remote->fetch_tags == -1)
358
+ no_tags = 1;
359
+
360
+ if (!transport->ops || !transport->ops->get_refs_list ||
361
+ !(transport->ops->fetch_refs || transport->ops->fetch_objs))
362
+ die("Don't know how to fetch from %s", transport->url);
363
+
364
+ /* if not appending, truncate FETCH_HEAD */
365
+ if (!append)
366
+ fclose(fopen(git_path("FETCH_HEAD"), "w"));
367
+
368
+ ref_map = get_ref_map(transport, refs, ref_count, tags, &autotags);
369
+
370
+ for (rm = ref_map; rm; rm = rm->next) {
371
+ if (rm->peer_ref)
372
+ read_ref(rm->peer_ref->name, rm->peer_ref->old_sha1);
373
+
374
+ printf("%s : %s\n", rm->name, rm->peer_ref ? rm->peer_ref->name : NULL);
375
+ printf(" < %s\n", sha1_to_hex(rm->old_sha1));
376
+ if (rm->peer_ref)
377
+ printf(" > %s\n", sha1_to_hex(rm->peer_ref->old_sha1));
378
+ if (!rm->peer_ref ||
379
+ hashcmp(rm->old_sha1, rm->peer_ref->old_sha1)) {
380
+ printf("%s needs update.\n", rm->name);
381
+ }
382
+ }
383
+
384
+ if (fetch_refs(transport, ref_map)) {
385
+ free_refs(ref_map);
386
+ return 1;
387
+ }
388
+
389
+ fetch_map = ref_map;
390
+
391
+ /* if neither --no-tags nor --tags was specified, do automated tag
392
+ * following ... */
393
+ if (!(tags || no_tags) && autotags) {
394
+ ref_map = find_non_local_tags(transport, fetch_map);
395
+ if (ref_map) {
396
+ transport_set_option(transport, TRANS_OPT_DEPTH, "0");
397
+ fetch_refs(transport, ref_map);
398
+ }
399
+ free_refs(ref_map);
400
+ }
401
+
402
+ free_refs(fetch_map);
403
+
404
+ return 0;
405
+}
406
+
407
+static int fetch_config(const char *var, const char *value)
408
+{
409
+ if (strcmp(var, "fetch.unpacklimit") == 0) {
410
+ unpacklimit = git_config_int(var, value);
411
+ return 0;
412
+ }
413
+
414
+ if (strcmp(var, "transfer.unpacklimit") == 0) {
415
+ unpacklimit = git_config_int(var, value);
416
+ return 0;
417
+ }
418
+
419
+ return git_default_config(var, value);
420
+}
421
+
422
+int cmd_fetch(int argc, const char **argv, const char *prefix)
423
+{
424
+ struct remote *remote;
425
+ struct transport *transport;
426
+ int i, j, rla_offset;
427
+ static const char **refs = NULL;
428
+ int ref_nr = 0;
429
+ int cmd_len = 0;
430
+ const char *depth = NULL, *upload_pack = NULL;
431
+ int keep = 0;
432
+
433
+ git_config(fetch_config);
434
+
435
+ for (i = 1; i < argc; i++) {
436
+ const char *arg = argv[i];
437
+ cmd_len += strlen(arg);
438
+
439
+ if (arg[0] != '-')
440
+ break;
441
+ if (!strcmp(arg, "--append") || !strcmp(arg, "-a")) {
442
+ append = 1;
443
+ continue;
444
+ }
445
+ if (!prefixcmp(arg, "--upload-pack=")) {
446
+ upload_pack = arg + 14;
447
+ continue;
448
+ }
449
+ if (!strcmp(arg, "--upload-pack")) {
450
+ i++;
451
+ if (i == argc)
452
+ usage(fetch_usage);
453
+ upload_pack = argv[i];
454
+ continue;
455
+ }
456
+ if (!strcmp(arg, "--force") || !strcmp(arg, "-f")) {
457
+ force = 1;
458
+ continue;
459
+ }
460
+ if (!strcmp(arg, "--no-tags")) {
461
+ no_tags = 1;
462
+ continue;
463
+ }
464
+ if (!strcmp(arg, "--tags") || !strcmp(arg, "-t")) {
465
+ tags = 1;
466
+ continue;
467
+ }
468
+ if (!strcmp(arg, "--keep") || !strcmp(arg, "-k")) {
469
+ keep = 1;
470
+ continue;
471
+ }
472
+ if (!strcmp(arg, "--update-head-ok") || !strcmp(arg, "-u")) {
473
+ update_head_ok = 1;
474
+ continue;
475
+ }
476
+ if (!prefixcmp(arg, "--depth=")) {
477
+ depth = arg + 8;
478
+ continue;
479
+ }
480
+ if (!strcmp(arg, "--depth")) {
481
+ i++;
482
+ if (i == argc)
483
+ usage(fetch_usage);
484
+ depth = argv[i];
485
+ continue;
486
+ }
487
+ if (!strcmp(arg, "--quiet")) {
488
+ quiet = 1;
489
+ continue;
490
+ }
491
+ if (!strcmp(arg, "--verbose") || !strcmp(arg, "-v")) {
492
+ verbose++;
493
+ continue;
494
+ }
495
+ usage(fetch_usage);
496
+ }
497
+
498
+ for (j = i; j < argc; j++)
499
+ cmd_len += strlen(argv[j]);
500
+
501
+ default_rla = xmalloc(cmd_len + 5 + argc + 1);
502
+ sprintf(default_rla, "fetch");
503
+ rla_offset = strlen(default_rla);
504
+ for (j = 1; j < argc; j++) {
505
+ sprintf(default_rla + rla_offset, " %s", argv[j]);
506
+ rla_offset += strlen(argv[j]);
507
+ }
508
+
509
+ if (i == argc)
510
+ remote = remote_get(NULL);
511
+ else
512
+ remote = remote_get(argv[i++]);
513
+
514
+ transport = transport_get(remote, remote->uri[0], 1);
515
+ if (verbose >= 2)
516
+ transport->verbose = 1;
517
+ if (quiet)
518
+ transport->verbose = 0;
519
+ if (upload_pack)
520
+ transport_set_option(transport, TRANS_OPT_UPLOADPACK, upload_pack);
521
+ if (keep)
522
+ transport_set_option(transport, TRANS_OPT_KEEP, "yes");
523
+ transport_set_option(transport, TRANS_OPT_DEPTH, depth);
524
+
525
+ if (!transport->url)
526
+ die("Where do you want to fetch from today?");
527
+
528
+ if (i < argc) {
529
+ int j = 0;
530
+ refs = xcalloc(argc - i + 1, sizeof(const char *));
531
+ while (i < argc) {
532
+ if (!strcmp(argv[i], "tag")) {
533
+ char *ref;
534
+ i++;
535
+ ref = xmalloc(strlen(argv[i]) * 2 + 22);
536
+ strcpy(ref, "refs/tags/");
537
+ strcat(ref, argv[i]);
538
+ strcat(ref, ":refs/tags/");
539
+ strcat(ref, argv[i]);
540
+ refs[j++] = ref;
541
+ } else
542
+ refs[j++] = argv[i];
543
+ i++;
544
+ }
545
+ refs[j] = NULL;
546
+ ref_nr = j;
547
+ for (j = 0; refs[j]; j++)
548
+ printf("ref: %s\n", refs[j]);
549
+ }
550
+
551
+ return do_fetch(transport, parse_ref_spec(ref_nr, refs), ref_nr);
552
+}
builtin.h
+1
@@ -31,6 +31,7 @@ extern int cmd_diff_files(int argc, const char **argv, const char *prefix);
31
extern int cmd_diff_index(int argc, const char **argv, const char *prefix);
32
extern int cmd_diff(int argc, const char **argv, const char *prefix);
33
extern int cmd_diff_tree(int argc, const char **argv, const char *prefix);
34
+extern int cmd_fetch(int argc, const char **argv, const char *prefix);
35
extern int cmd_fetch_pack(int argc, const char **argv, const char *prefix);
36
extern int cmd_fetch__tool(int argc, const char **argv, const char *prefix);
37
extern int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix);
cache.h
+1
@@ -492,6 +492,7 @@ struct ref {
492
unsigned char old_sha1[20];
493
unsigned char new_sha1[20];
494
unsigned char force;
495
+ unsigned char merge;
496
struct ref *peer_ref; /* when renaming */
497
char name[FLEX_ARRAY]; /* more */
498
};
contrib/examples/git-fetch.sh
renamed
git.c
+1
@@ -334,6 +334,7 @@ static void handle_internal_command(int argc, const char **argv)
334
{ "diff-files", cmd_diff_files },
335
{ "diff-index", cmd_diff_index, RUN_SETUP },
336
{ "diff-tree", cmd_diff_tree, RUN_SETUP },
337
+ { "fetch", cmd_fetch, RUN_SETUP },
338
{ "fetch-pack", cmd_fetch_pack, RUN_SETUP },
339
{ "fetch--tool", cmd_fetch__tool, RUN_SETUP },
340
{ "fmt-merge-msg", cmd_fmt_merge_msg, RUN_SETUP },
t/t5515/fetch.br-branches-default-merge
+1
-1
@@ -1,5 +1,5 @@
1
# br-branches-default-merge
2
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f branch 'master' of ../
2
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
3
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge tag 'tag-master' of ../
4
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
5
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
t/t5515/fetch.br-branches-default-merge_branches-default
+1
-1
@@ -1,5 +1,5 @@
1
# br-branches-default-merge branches-default
2
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f branch 'master' of ../
2
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
3
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge tag 'tag-master' of ../
4
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
5
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
t/t5515/fetch.br-branches-default-octopus
+1
-1
@@ -1,5 +1,5 @@
1
# br-branches-default-octopus
2
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f branch 'master' of ../
2
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
3
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge tag 'tag-master' of ../
4
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
5
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
t/t5515/fetch.br-branches-default-octopus_branches-default
+1
-1
@@ -1,5 +1,5 @@
1
# br-branches-default-octopus branches-default
2
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f branch 'master' of ../
2
+754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
3
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge tag 'tag-master' of ../
4
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
5
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
t/t5515/fetch.br-branches-one-merge
+1
-1
@@ -1,5 +1,5 @@
1
# br-branches-one-merge
2
-8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
2
+8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
3
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge tag 'tag-master' of ../
4
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
5
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
t/t5515/fetch.br-branches-one-merge_branches-one
+1
-1
@@ -1,5 +1,5 @@
1
# br-branches-one-merge branches-one
2
-8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
2
+8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge branch 'one' of ../
3
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge tag 'tag-master' of ../
4
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
5
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
t/t5515/fetch.br-config-glob-octopus
+1
-1
@@ -2,7 +2,7 @@
2
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
3
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
4
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
5
-6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
5
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
6
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge tag 'tag-master' of ../
7
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
8
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
t/t5515/fetch.br-config-glob-octopus_config-glob
+1
-1
@@ -2,7 +2,7 @@
2
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
3
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
4
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
5
-6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
5
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
6
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge tag 'tag-master' of ../
7
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
8
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
t/t5515/fetch.br-remote-glob-octopus
+1
-1
@@ -2,7 +2,7 @@
2
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
3
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
4
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
5
-6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
5
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
6
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge tag 'tag-master' of ../
7
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
8
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../
t/t5515/fetch.br-remote-glob-octopus_remote-glob
+1
-1
@@ -2,7 +2,7 @@
2
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge branch 'master' of ../
3
8e32a6d901327a23ef831511badce7bf3bf46689 branch 'one' of ../
4
0567da4d5edd2ff4bb292a465ba9e64dcad9536b not-for-merge branch 'three' of ../
5
-6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 not-for-merge branch 'two' of ../
5
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 branch 'two' of ../
6
754b754407bf032e9a2f9d5a9ad05ca79a6b228f not-for-merge tag 'tag-master' of ../
7
8e32a6d901327a23ef831511badce7bf3bf46689 not-for-merge tag 'tag-one' of ../
8
22feea448b023a2d864ef94b013735af34d238ba not-for-merge tag 'tag-one-tree' of ../