820a5361
|
1390
|
die("expected '<hash> <uri>', got: %s\n", reader->line);
|
820a5361
|
1395
|
die("expected DELIM");
|
820a5361
|
1522
|
die("fetch-pack: unable to spawn http-fetch");
|
820a5361
|
1526
|
die("fetch-pack: expected keep then TAB at start of http-fetch output");
|
820a5361
|
1531
|
die("fetch-pack: expected hash then LF at end of http-fetch output");
|
820a5361
|
1538
|
die("fetch-pack: unable to finish http-fetch");
|
820a5361
|
1542
|
die("fetch-pack: pack downloaded from %s does not match expected hash %.*s",
|
820a5361
|
1543
|
uri, (int) the_hash_algo->hexsz,
|
820a5361
|
1544
|
packfile_uris.items[i].string);
|
0ba08c05
|
25
|
die(_("Remote with no URL"));
|
54248706
|
61
|
warning(_("promisor remote name cannot begin with '/': %s"),
|
54248706
|
63
|
return NULL;
|
7bdf0926
|
93
|
previous->next = r->next;
|
7b6e1b04
|
108
|
return git_config_string(&core_partial_clone_filter_default,
|
b21a55f3
|
139
|
return 0;
|
dcc8b4e9
|
202
|
static int remove_fetched_oids(struct object_id **oids, int oid_nr, int to_free)
|
dcc8b4e9
|
204
|
int i, missing_nr = 0;
|
dcc8b4e9
|
205
|
int *missing = xcalloc(oid_nr, sizeof(*missing));
|
dcc8b4e9
|
206
|
struct object_id *old_oids = *oids;
|
dcc8b4e9
|
208
|
int old_fetch_if_missing = fetch_if_missing;
|
dcc8b4e9
|
210
|
fetch_if_missing = 0;
|
dcc8b4e9
|
212
|
for (i = 0; i < oid_nr; i++)
|
dcc8b4e9
|
213
|
if (oid_object_info_extended(the_repository, &old_oids[i], NULL, 0)) {
|
dcc8b4e9
|
214
|
missing[i] = 1;
|
dcc8b4e9
|
215
|
missing_nr++;
|
dcc8b4e9
|
218
|
fetch_if_missing = old_fetch_if_missing;
|
dcc8b4e9
|
220
|
if (missing_nr) {
|
dcc8b4e9
|
221
|
int j = 0;
|
dcc8b4e9
|
222
|
new_oids = xcalloc(missing_nr, sizeof(*new_oids));
|
dcc8b4e9
|
223
|
for (i = 0; i < oid_nr; i++)
|
dcc8b4e9
|
224
|
if (missing[i])
|
dcc8b4e9
|
225
|
oidcpy(&new_oids[j++], &old_oids[i]);
|
dcc8b4e9
|
226
|
*oids = new_oids;
|
dcc8b4e9
|
227
|
if (to_free)
|
dcc8b4e9
|
228
|
free(old_oids);
|
dcc8b4e9
|
231
|
free(missing);
|
dcc8b4e9
|
233
|
return missing_nr;
|
dcc8b4e9
|
248
|
if (missing_nr == 1)
|
dcc8b4e9
|
249
|
continue;
|
dcc8b4e9
|
250
|
missing_nr = remove_fetched_oids(&missing_oids, missing_nr, to_free);
|
dcc8b4e9
|
251
|
if (missing_nr) {
|
dcc8b4e9
|
252
|
to_free = 1;
|
dcc8b4e9
|
253
|
continue;
|
dcc8b4e9
|
261
|
free(missing_oids);
|
Barret Rhoden
|
f93895f8
|
Move oidset_parse_file() to oidset.c
|
Barret Rhoden
|
1fc73384
|
blame: optionally track line fingerprints during fill_blame_origin()
|
Barret Rhoden
|
8934ac8c
|
blame: add config options for the output of ignored or unblamable lines
|
Barret Rhoden
|
43885768
|
blame: use the fingerprint heuristic to match ignored lines
|
Barret Rhoden
|
ae3f36de
|
blame: add the ability to ignore commits and their changes
|
Christian Couder
|
e265069a
|
Use promisor_remote_get_direct() and has_promisor_remote()
|
Christian Couder
|
dcc8b4e9
|
promisor-remote: implement promisor_remote_get_direct()
|
Christian Couder
|
b21a55f3
|
promisor-remote: parse remote.*.partialclonefilter
|
Christian Couder
|
7bdf0926
|
promisor-remote: use repository_format_partial_clone
|
Christian Couder
|
0ba08c05
|
Remove fetch-object.{c,h} in favor of promisor-remote.{c,h}
|
Christian Couder
|
54248706
|
Add initial support for many promisor remotes
|
Christian Couder
|
7b6e1b04
|
Move core_partial_clone_filter_default to promisor-remote.c
|
Denton Liu
|
f39a9c65
|
remote: add --save-to-push option to git remote set-url
|
Jonathan Tan
|
472fbef8
|
http-fetch: support fetching packfiles by URL
|
Jonathan Tan
|
a8d662e3
|
upload-pack: refactor reading of pack-objects out
|
Jonathan Tan
|
820a5361
|
upload-pack: send part of packfile response as uri
|
Jonathan Tan
|
bf01639c
|
fetch-pack: support more than one pack lockfile
|
Josh Steadmon
|
6da1f1a9
|
protocol: advertise multiple supported versions
|
Junio C Hamano
|
b472070f
|
Merge branch 'jt/fetch-cdn-offload' into pu
|
Martin Koegler
|
5efde212
|
zlib.c: use size_t for size
|
Michael Platings
|
170072f9
|
blame: add a fingerprint heuristic to match ignored lines
|
a5e5f399
|
415
|
die(_("'%s' cannot be used with updating paths"),
|
a5e5f399
|
425
|
die(_("'%s' cannot be used with %s"),
|
183fb44f
|
433
|
die(_("neither '%s' or '%s' is specified"),
|
183fb44f
|
437
|
die(_("'%s' must be used when '%s' is not specified"),
|
e3ddd3b5
|
442
|
die(_("'%s' or '%s' cannot be used with %s"),
|
e3ddd3b5
|
447
|
die(_("'%s' or '%s' cannot be used with %s"),
|
183fb44f
|
456
|
patch_mode = "--patch=reset";
|
2f0896ec
|
460
|
BUG("either flag must have been set, worktree=%d, index=%d",
|
183fb44f
|
536
|
die(_("unable to write new index file"));
|
1806c29f
|
656
|
BUG("'switch --orphan' should never accept a commit as starting point");
|
1806c29f
|
1039
|
BUG("'switch --orphan' should never accept a commit as starting point");
|
5c06e269
|
1176
|
die(_("only one reference expected"));
|
7968bef0
|
1300
|
const char *ref = to_free;
|
7968bef0
|
1302
|
if (skip_prefix(ref, "refs/tags/", &ref))
|
7968bef0
|
1303
|
die(_("a branch is expected, got tag '%s'"), ref);
|
7968bef0
|
1304
|
if (skip_prefix(ref, "refs/remotes/", &ref))
|
7968bef0
|
1305
|
die(_("a branch is expected, got remote branch '%s'"), ref);
|
7968bef0
|
1306
|
die(_("a branch is expected, got '%s'"), ref);
|
7968bef0
|
1314
|
die(_("a branch is expected, got '%s'"), branch_info->name);
|
c45f0f52
|
1329
|
die(_("cannot switch branch in the middle of an am session\n"
|
c45f0f52
|
1333
|
die(_("cannot switch branch while rebasing\n"
|
c45f0f52
|
1337
|
die(_("cannot switch branch while cherry-picking\n"
|
c45f0f52
|
1341
|
die(_("cannot switch branch while reverting\n"
|
c45f0f52
|
1345
|
die(_("cannot switch branch while bisecting\n"
|
3ec37ad1
|
1372
|
die(_("'%s' cannot be used with '%s'"), "--discard-changes", "--merge");
|
c9c935f6
|
1510
|
BUG("make up your mind, you need to take _something_");
|
183fb44f
|
1542
|
opts->checkout_index = 0;
|
183fb44f
|
1552
|
BUG("these flags should be non-negative by now");
|
c9c935f6
|
1613
|
die(_("could not resolve %s"), opts->from_treeish);
|
a53af50b
|
269
|
chunk_repeated = 1;
|
a53af50b
|
339
|
warning(_("commit-graph has no base graphs chunk"));
|
a53af50b
|
340
|
return 0;
|
cd556367
|
344
|
n--;
|
a53af50b
|
346
|
if (!oideq(&oids[n], &cur_g->oid) ||
|
a53af50b
|
347
|
!hasheq(oids[n].hash, g->chunk_base_graphs + g->hash_len * n)) {
|
a53af50b
|
348
|
warning(_("commit-graph chain does not match"));
|
a53af50b
|
349
|
return 0;
|
cd556367
|
353
|
cur_g = cur_g->base_graph;
|
cd556367
|
380
|
free(chain_name);
|
cd556367
|
381
|
return NULL;
|
cd556367
|
388
|
return NULL;
|
cd556367
|
396
|
warning(_("invalid commit-graph chain: line '%s' not a hash"),
|
cd556367
|
398
|
valid = 0;
|
cd556367
|
399
|
break;
|
c6b73769
|
414
|
valid = 0;
|
2d06258b
|
531
|
BUG("NULL commit-graph");
|
2d06258b
|
537
|
BUG("position %d is beyond the scope of this commit-graph (%d local + %d base commits)",
|
2d06258b
|
598
|
BUG("position %d is beyond the scope of this commit-graph (%d local + %d base commits)",
|
4ece4fc1
|
945
|
if (find_commit_in_graph(parent->item,
|
4ece4fc1
|
948
|
edge_value = pos;
|
4ece4fc1
|
1043
|
continue;
|
d83160e8
|
1165
|
error(_("error opening index for %s"), packname.buf);
|
d83160e8
|
1166
|
return 1;
|
63a8be62
|
1205
|
continue;
|
93ba1867
|
1228
|
display_progress(ctx->progress, ctx->approx_nr_objects);
|
4ece4fc1
|
1317
|
error(_("failed to write correct number of base graph ids"));
|
4ece4fc1
|
1318
|
return -1;
|
8520d7fc
|
1350
|
error(_("unable to create leading directories of %s"),
|
8520d7fc
|
1352
|
return errno;
|
4ece4fc1
|
1362
|
error(_("unable to create '%s'"), ctx->graph_name);
|
4ece4fc1
|
1363
|
return -1;
|
4ece4fc1
|
1437
|
return -1;
|
4ece4fc1
|
1463
|
error(_("unable to open commit-graph chain file"));
|
4ece4fc1
|
1464
|
return -1;
|
da09c6fe
|
1475
|
error(_("failed to rename base commit-graph file"));
|
4ece4fc1
|
1495
|
error(_("failed to rename temporary commit-graph file"));
|
4ece4fc1
|
1496
|
return -1;
|
00a8cb54
|
1523
|
(max_commits && num_commits > max_commits))) {
|
c6b73769
|
1525
|
break;
|
c6b73769
|
1540
|
ctx->num_commit_graphs_after = 1;
|
c6b73769
|
1541
|
ctx->new_base_graph = NULL;
|
0e2ec504
|
1617
|
duplicates++;
|
0e2ec504
|
1620
|
ctx->commits.list[last_distinct + 1] = ctx->commits.list[i];
|
0e2ec504
|
1628
|
ctx->num_extra_edges += num_parents - 2;
|
00a8cb54
|
1788
|
ctx->oids.alloc = split_opts->max_commits;
|
efeb229e
|
1824
|
error(_("the commit graph format cannot write %d commits"), count_distinct);
|
efeb229e
|
1825
|
res = 1;
|
efeb229e
|
1826
|
goto cleanup;
|
efeb229e
|
1835
|
error(_("too many commits to write graph"));
|
efeb229e
|
1836
|
res = 1;
|
efeb229e
|
1837
|
goto cleanup;
|
Denton Liu
|
07b2c0ea
|
config: learn the "onbranch:" includeIf condition
|
Denton Liu
|
526c03b5
|
rebase: refactor can_fast_forward into goto tower
|
Denton Liu
|
10572de1
|
rebase: fast-forward --onto in more cases
|
Derrick Stolee
|
0e2ec504
|
commit-graph: merge commit-graph chains
|
Derrick Stolee
|
efeb229e
|
commit-graph: return with errors during write
|
Derrick Stolee
|
00a8cb54
|
commit-graph: create options for split files
|
Derrick Stolee
|
da09c6fe
|
commit-graph: add --split option to builtin
|
Derrick Stolee
|
8520d7fc
|
commit-graph: extract write_commit_graph_file()
|
Derrick Stolee
|
63a8be62
|
commit-graph: extract fill_oids_from_commit_hex()
|
Derrick Stolee
|
93ba1867
|
commit-graph: extract fill_oids_from_all_packs()
|
Derrick Stolee
|
4ece4fc1
|
commit-graph: write commit-graph chains
|
Derrick Stolee
|
2d06258b
|
commit-graph: prepare for commit-graph chains
|
Derrick Stolee
|
c6b73769
|
commit-graph: allow cross-alternate chains
|
Derrick Stolee
|
cd556367
|
commit-graph: load commit-graph chains
|
Derrick Stolee
|
a53af50b
|
commit-graph: add base graphs chunk
|
Derrick Stolee
|
d83160e8
|
commit-graph: extract fill_oids_from_packs()
|
Jonathan Nieder
|
ee70c128
|
index: offer advice for unknown index extensions
|
Nguyễn Thái Ngọc Duy
|
2f0896ec
|
restore: support --patch
|
Nguyễn Thái Ngọc Duy
|
7968bef0
|
switch: only allow explicit detached HEAD
|
Nguyễn Thái Ngọc Duy
|
c45f0f52
|
switch: reject if some operation is in progress
|
Nguyễn Thái Ngọc Duy
|
5c06e269
|
switch: stop accepting pathspec
|
Nguyễn Thái Ngọc Duy
|
1806c29f
|
switch: make --orphan switch to an empty tree
|
Nguyễn Thái Ngọc Duy
|
e3ddd3b5
|
restore: reject invalid combinations with --staged
|
Nguyễn Thái Ngọc Duy
|
c9c935f6
|
restore: take tree-ish from --source option instead
|
Nguyễn Thái Ngọc Duy
|
a5e5f399
|
restore: replace --force with --ignore-unmerged
|
Nguyễn Thái Ngọc Duy
|
3ec37ad1
|
switch: add --discard-changes
|
Nguyễn Thái Ngọc Duy
|
183fb44f
|
restore: add --worktree and --staged
|
Nickolai Belakovski
|
2582083f
|
ref-filter: add worktreepath atom
|
Philip Oakley
|
1fde99cf
|
doc branch: provide examples for listing remote tracking branches
|
Phillip Wood
|
37e9ee5c
|
sequencer: return errors from sequencer_remove_state()
|
Phillip Wood
|
d559f502
|
rebase --abort/--quit: cleanup refs/rewritten
|
Denton Liu
|
13cdf780
|
format-patch: teach format.notes config option
|
Elijah Newren
|
e80001f8
|
fast-export: do automatic reencoding of commit messages only if requested
|
Elijah Newren
|
ccbfc96d
|
fast-export: avoid stripping encoding header if we cannot reencode
|
Elijah Newren
|
3edfcc65
|
fast-import: support 'encoding' commit header
|
Emily Shaffer
|
de99eb0c
|
grep: fail if call could output and name is null
|
Eric Wong
|
f4f476b6
|
update-server-info: avoid needless overwrites
|
Jeff King
|
97387c8b
|
am: read interactive input from stdin
|
Jeff King
|
6e7baf24
|
am: drop tty requirement for --interactive
|
Jeff King
|
76a7bc09
|
cmd_{read,write}_tree: rename "unused" variable that is used
|
Jeff King
|
7bd9631b
|
read-cache: drop unused parameter from threaded load
|
Johannes Schindelin
|
7877ac3d
|
bisect--helper: verify HEAD could be parsed before continuing
|
Jonathan Tan
|
8a30a1ef
|
index-pack: prefetch missing REF_DELTA bases
|
Matthew DeVore
|
5c03bc8b
|
list-objects-filter-options: error is localizeable
|
Nguyễn Thái Ngọc Duy
|
f3f8311e
|
merge: add --quit
|
Nguyễn Thái Ngọc Duy
|
1de16aec
|
worktree add: sanitize worktree names
|