820a5361
|
1397
|
die("expected '<hash> <uri>', got: %s\n", reader->line);
|
820a5361
|
1402
|
die("expected DELIM");
|
820a5361
|
1529
|
die("fetch-pack: unable to spawn http-fetch");
|
820a5361
|
1533
|
die("fetch-pack: expected keep then TAB at start of http-fetch output");
|
820a5361
|
1538
|
die("fetch-pack: expected hash then LF at end of http-fetch output");
|
820a5361
|
1545
|
die("fetch-pack: unable to finish http-fetch");
|
820a5361
|
1549
|
die("fetch-pack: pack downloaded from %s does not match expected hash %.*s",
|
820a5361
|
1550
|
uri, (int) the_hash_algo->hexsz,
|
820a5361
|
1551
|
packfile_uris.items[i].string);
|
db27dca5
|
25
|
die(_("Remote with no URL"));
|
48de3158
|
61
|
warning(_("promisor remote name cannot begin with '/': %s"),
|
48de3158
|
63
|
return NULL;
|
faf2abf4
|
93
|
previous->next = r->next;
|
4ca9474e
|
108
|
return git_config_string(&core_partial_clone_filter_default,
|
fa3d1b63
|
139
|
return 0;
|
9e27beaa
|
202
|
static int remove_fetched_oids(struct repository *repo,
|
9e27beaa
|
206
|
int i, remaining_nr = 0;
|
9e27beaa
|
207
|
int *remaining = xcalloc(oid_nr, sizeof(*remaining));
|
9e27beaa
|
208
|
struct object_id *old_oids = *oids;
|
9e27beaa
|
211
|
for (i = 0; i < oid_nr; i++)
|
9e27beaa
|
212
|
if (oid_object_info_extended(repo, &old_oids[i], NULL,
|
9e27beaa
|
214
|
remaining[i] = 1;
|
9e27beaa
|
215
|
remaining_nr++;
|
9e27beaa
|
218
|
if (remaining_nr) {
|
9e27beaa
|
219
|
int j = 0;
|
9e27beaa
|
220
|
new_oids = xcalloc(remaining_nr, sizeof(*new_oids));
|
9e27beaa
|
221
|
for (i = 0; i < oid_nr; i++)
|
9e27beaa
|
222
|
if (remaining[i])
|
9e27beaa
|
223
|
oidcpy(&new_oids[j++], &old_oids[i]);
|
9e27beaa
|
224
|
*oids = new_oids;
|
9e27beaa
|
225
|
if (to_free)
|
9e27beaa
|
226
|
free(old_oids);
|
9e27beaa
|
229
|
free(remaining);
|
9e27beaa
|
231
|
return remaining_nr;
|
9e27beaa
|
248
|
if (remaining_nr == 1)
|
9e27beaa
|
249
|
continue;
|
9e27beaa
|
250
|
remaining_nr = remove_fetched_oids(repo, &remaining_oids,
|
9e27beaa
|
252
|
if (remaining_nr) {
|
9e27beaa
|
253
|
to_free = 1;
|
9e27beaa
|
254
|
continue;
|
9e27beaa
|
262
|
free(remaining_oids);
|
Christian Couder
|
b14ed5ad
|
Use promisor_remote_get_direct() and has_promisor_remote()
|
Christian Couder
|
faf2abf4
|
promisor-remote: use repository_format_partial_clone
|
Christian Couder
|
4ca9474e
|
Move core_partial_clone_filter_default to promisor-remote.c
|
Christian Couder
|
fa3d1b63
|
promisor-remote: parse remote.*.partialclonefilter
|
Christian Couder
|
9e27beaa
|
promisor-remote: implement promisor_remote_get_direct()
|
Christian Couder
|
db27dca5
|
Remove fetch-object.{c,h} in favor of promisor-remote.{c,h}
|
Christian Couder
|
48de3158
|
Add initial support for many promisor remotes
|
Daniel Ferreira
|
9bd70db7
|
dir-iterator: add tests for dir-iterator API
|
Denton Liu
|
10572de1
|
rebase: fast-forward --onto in more cases
|
Denton Liu
|
526c03b5
|
rebase: refactor can_fast_forward into goto tower
|
Denton Liu
|
f39a9c65
|
remote: add --save-to-push option to git remote set-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
|
Jonathan Tan
|
472fbef8
|
http-fetch: support fetching packfiles by URL
|
Josh Steadmon
|
6da1f1a9
|
protocol: advertise multiple supported versions
|
Junio C Hamano
|
18615216
|
Merge branch 'jt/fetch-cdn-offload' into pu
|
Martin Koegler
|
5efde212
|
zlib.c: use size_t for size
|
Matheus Tavares
|
c40f077a
|
dir-iterator: use warning_errno when possible
|
Matheus Tavares
|
655af733
|
dir-iterator: add flags parameter to dir_iterator_begin
|
Matheus Tavares
|
50e85c40
|
dir-iterator: refactor state machine model
|
Matheus Tavares
|
d95432d7
|
clone: use dir-iterator to avoid explicit dir traversal
|
Matheus Tavares
|
fbb4a33c
|
clone: extract function from copy_or_link_directory
|
Matthew DeVore
|
f56f7642
|
list-objects-filter-options: move error check up
|
Matthew DeVore
|
cf9ceb5a
|
list-objects-filter-options: make filter_spec a string_list
|
Matthew DeVore
|
9430147c
|
list-objects-filter: encapsulate filter components
|
Matthew DeVore
|
e987df5f
|
list-objects-filter: implement composite filters
|
3b2385cf
|
2840
|
static void jw_object_untracked_cache_dir(struct json_writer *jw,
|
3b2385cf
|
2845
|
jw_object_bool(jw, "valid", ucd->valid);
|
3b2385cf
|
2846
|
jw_object_bool(jw, "check-only", ucd->check_only);
|
3b2385cf
|
2847
|
jw_object_stat_data(jw, "stat", &ucd->stat_data);
|
3b2385cf
|
2848
|
jw_object_string(jw, "exclude-oid", oid_to_hex(&ucd->exclude_oid));
|
3b2385cf
|
2849
|
jw_object_inline_begin_array(jw, "untracked");
|
3b2385cf
|
2850
|
for (i = 0; i < ucd->untracked_nr; i++)
|
3b2385cf
|
2851
|
jw_array_string(jw, ucd->untracked[i]);
|
3b2385cf
|
2852
|
jw_end(jw);
|
3b2385cf
|
2854
|
jw_object_inline_begin_object(jw, "dirs");
|
3b2385cf
|
2855
|
for (i = 0; i < ucd->dirs_nr; i++) {
|
3b2385cf
|
2856
|
jw_object_inline_begin_object(jw, ucd->dirs[i]->name);
|
3b2385cf
|
2857
|
jw_object_untracked_cache_dir(jw, ucd->dirs[i]);
|
3b2385cf
|
2858
|
jw_end(jw);
|
3b2385cf
|
2860
|
jw_end(jw);
|
3b2385cf
|
2861
|
}
|
3b2385cf
|
2958
|
jw_object_inline_begin_object(jw, "root");
|
3b2385cf
|
2959
|
jw_object_untracked_cache_dir(jw, uc->root);
|
3b2385cf
|
2960
|
jw_end(jw);
|
8eeabe15
|
1754
|
ret = error(_("index uses %.4s extension, which we do not understand"),
|
ee70c128
|
1756
|
if (advice_unknown_index_extension) {
|
ee70c128
|
1757
|
warning(_("ignoring optional %.4s index extension"), ext);
|
ee70c128
|
1758
|
advise(_("This is likely due to the file having been written by a newer\n"
|
272b3f2a
|
2028
|
jw_object_true(jw, "assume_unchanged");
|
272b3f2a
|
2032
|
jw_object_true(jw, "skip_worktree");
|
272b3f2a
|
2034
|
jw_object_intmax(jw, "stage", ce_stage(ce));
|
f0f544da
|
2311
|
ieot = read_ieot_extension(istate, mmap, mmap_size, extension_offset);
|
f0f544da
|
3653
|
static struct index_entry_offset_table *read_ieot_extension(
|
f0f544da
|
3675
|
return do_read_ieot_extension(istate, index, extsize);
|
Derrick Stolee
|
bbd04cf0
|
repo-settings: pack.useSparse=true
|
Jonathan Nieder
|
ee70c128
|
index: offer advice for unknown index extensions
|
Nguyễn Thái Ngọc Duy
|
272b3f2a
|
ls-files: add --json to dump the index
|
Nguyễn Thái Ngọc Duy
|
fd335a21
|
cache-tree.c: dump "TREE" extension as json
|
Nguyễn Thái Ngọc Duy
|
3b2385cf
|
dir.c: dump "UNTR" extension as json
|
Nguyễn Thái Ngọc Duy
|
8eeabe15
|
read-cache.c: dump common extension info in json
|
Nguyễn Thái Ngọc Duy
|
f0f544da
|
read-cache.c: dump "IEOT" extension as json
|
Nguyễn Thái Ngọc Duy
|
1f825794
|
split-index.c: dump "link" extension as json
|
Thomas Gummerer
|
85c3713d
|
apply: only pass required data to git_header_name
|
Thomas Gummerer
|
ab5b0492
|
range-diff: split lines manually
|
Thomas Gummerer
|
04539fc6
|
range-diff: add section header instead of diff header
|
Ævar Arnfjörð Bjarmason
|
2e43cd4c
|
config.c: refactor die_bad_number() to not call gettext() early
|
Ævar Arnfjörð Bjarmason
|
b4f207f3
|
env--helper: new undocumented builtin wrapping git_env_*()
|
Barret Rhoden
|
ae3f36de
|
blame: add the ability to ignore commits and their changes
|
Barret Rhoden
|
f93895f8
|
Move oidset_parse_file() to oidset.c
|
Barret Rhoden
|
1fc73384
|
blame: optionally track line fingerprints during fill_blame_origin()
|
Barret Rhoden
|
a07a9776
|
blame: use the fingerprint heuristic to match ignored lines
|
Derrick Stolee
|
c2bc6e6a
|
commit-graph: create options for split files
|
Derrick Stolee
|
ce1e4a10
|
midx: implement midx_repack()
|
Derrick Stolee
|
19575c7c
|
multi-pack-index: implement 'expire' subcommand
|
Derrick Stolee
|
d01bf2e6
|
midx: refactor permutation logic and pack sorting
|
Derrick Stolee
|
2af890bb
|
multi-pack-index: prepare 'repack' subcommand
|
Derrick Stolee
|
1771be90
|
commit-graph: merge commit-graph chains
|
Derrick Stolee
|
c523035c
|
commit-graph: allow cross-alternate chains
|
Derrick Stolee
|
135a7123
|
commit-graph: add --split option to builtin
|
Derrick Stolee
|
6c622f9f
|
commit-graph: write commit-graph chains
|
Derrick Stolee
|
d4f4d60f
|
commit-graph: prepare for commit-graph chains
|
Derrick Stolee
|
5c84b339
|
commit-graph: load commit-graph chains
|
Derrick Stolee
|
118bd570
|
commit-graph: add base graphs chunk
|
Derrick Stolee
|
8434e85d
|
repack: refactor pack deletion for future use
|
Dimitriy Ryazantcev
|
8f354a1f
|
l10n: localizable upload progress messages
|
Jeff King
|
709dfa69
|
object-store.h: move for_each_alternate_ref() from transport.h
|
Johannes Schindelin
|
906b6394
|
rebase --am: ignore rebase.rescheduleFailedExec
|
Nguyễn Thái Ngọc Duy
|
90d34051
|
match-trees.c: remove the_repo from shift_tree*()
|
Nguyễn Thái Ngọc Duy
|
d3b4705a
|
sha1-file.c: remove the_repo from read_object_with_reference()
|
Nguyễn Thái Ngọc Duy
|
50ddb089
|
tree-walk.c: remove the_repo from get_tree_entry()
|
Phillip Wood
|
ed5b1ca1
|
status: do not report errors in sequencer/todo
|
Rohit Ashiwal
|
6a1f9046
|
sequencer: add advice for revert
|
Rohit Ashiwal
|
de81ca3f
|
cherry-pick/revert: add --skip option
|
Taylor Blau
|
b31e2680
|
ref-filter.c: find disjoint pattern prefixes
|
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"
|
d16dc428
|
1345
|
warning(_("you are switching branch while bisecting"));
|
3ec37ad1
|
1370
|
die(_("'%s' cannot be used with '%s'"), "--discard-changes", "--merge");
|
c9c935f6
|
1508
|
BUG("make up your mind, you need to take _something_");
|
183fb44f
|
1540
|
opts->checkout_index = 0;
|
183fb44f
|
1550
|
BUG("these flags should be non-negative by now");
|
c9c935f6
|
1611
|
die(_("could not resolve %s"), opts->from_treeish);
|
Denton Liu
|
07b2c0ea
|
config: learn the "onbranch:" includeIf condition
|
Derrick Stolee
|
ef5b83f2
|
commit-graph: extract fill_oids_from_packs()
|
Derrick Stolee
|
e103f727
|
commit-graph: return with errors during write
|
Derrick Stolee
|
cdbd70c4
|
fetch: add --[no-]show-forced-updates argument
|
Derrick Stolee
|
377444b4
|
fetch: warn about forced updates in branch listing
|
Derrick Stolee
|
3883c551
|
pull: add --[no-]show-forced-updates passthrough
|
Derrick Stolee
|
238def57
|
commit-graph: extract write_commit_graph_file()
|
Derrick Stolee
|
4c9efe85
|
commit-graph: extract fill_oids_from_commit_hex()
|
Derrick Stolee
|
b2c83060
|
commit-graph: extract fill_oids_from_all_packs()
|
Jeff Hostetler
|
0a53561a
|
status: warn when a/b calculation takes too long
|
Jeff King
|
62b89d43
|
upload-pack: rename a "sha1" variable to "oid"
|
Jeff King
|
d0229abd
|
object: convert lookup_object() to use object_id
|
Jeff King
|
bdbdf42f
|
delta-islands: respect progress flag
|
Jeff King
|
d2bc62b1
|
pack-bitmap: convert khash_sha1 maps into kh_oid_map
|
Jeff King
|
05805d74
|
pack-bitmap-write: convert some helpers to use object_id
|
Johannes Schindelin
|
08e04506
|
kwset: allow building with GCC 8
|
Matthew DeVore
|
28438e84
|
ref-filter: sort detached HEAD lines firstly
|
Nguyễn Thái Ngọc Duy
|
a5e5f399
|
restore: replace --force with --ignore-unmerged
|
Nguyễn Thái Ngọc Duy
|
e3ddd3b5
|
restore: reject invalid combinations with --staged
|
Nguyễn Thái Ngọc Duy
|
2f0896ec
|
restore: support --patch
|
Nguyễn Thái Ngọc Duy
|
1806c29f
|
switch: make --orphan switch to an empty tree
|
Nguyễn Thái Ngọc Duy
|
5c06e269
|
switch: stop accepting pathspec
|
Nguyễn Thái Ngọc Duy
|
c45f0f52
|
switch: reject if some operation is in progress
|
Nguyễn Thái Ngọc Duy
|
7968bef0
|
switch: only allow explicit detached HEAD
|
Nguyễn Thái Ngọc Duy
|
0778b293
|
fetch-pack: move capability names out of i18n strings
|
Nguyễn Thái Ngọc Duy
|
5a88583b
|
fetch-pack: print all relevant supported capabilities with -v -v
|
Nguyễn Thái Ngọc Duy
|
183fb44f
|
restore: add --worktree and --staged
|
Nguyễn Thái Ngọc Duy
|
c9c935f6
|
restore: take tree-ish from --source option instead
|
Nguyễn Thái Ngọc Duy
|
3ec37ad1
|
switch: add --discard-changes
|
Nguyễn Thái Ngọc Duy
|
d16dc428
|
switch: allow to switch in the middle of bisect
|
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
|
René Scharfe
|
568a05c5
|
cleanup: fix possible overflow errors in binary search, part 2
|
René Scharfe
|
921d49be
|
use COPY_ARRAY for copying arrays
|
SZEDER Gábor
|
cd1096b2
|
pager: add a helper function to clear the last line in the terminal
|
SZEDER Gábor
|
5b12e312
|
progress: use term_clear_line()
|