efcf6cf0
|
641
|
} else if (!read_oneliner(&buf, state_dir_path("head", opts),
|
cd5e0fd9
|
834
|
argv_array_push(&am.args, "--ignore-whitespace");
|
cd5e0fd9
|
836
|
argv_array_push(&opts->git_am_opts, "--committer-date-is-author-date");
|
cd5e0fd9
|
838
|
argv_array_push(&opts->git_am_opts, "--ignore-date");
|
f213f069
|
902
|
reset_head(the_repository, &opts->orig_head, "checkout",
|
f213f069
|
903
|
opts->head_name, 0,
|
86ed00af
|
1063
|
apply_autostash(state_dir_path("autostash", opts));
|
Denton Liu
|
804fe315
|
sequencer: implement apply_autostash_oid()
|
Denton Liu
|
be1bb600
|
sequencer: make apply_autostash() accept a path
|
Denton Liu
|
65c425a2
|
sequencer: stop leaking buf
|
Denton Liu
|
5b2f6d9c
|
sequencer: make file exists check more efficient
|
Denton Liu
|
efcf6cf0
|
rebase: use read_oneliner()
|
Denton Liu
|
b309a971
|
reset: extract reset_head() from rebase
|
Denton Liu
|
f213f069
|
rebase: generify reset_head()
|
Denton Liu
|
86ed00af
|
rebase: use apply_autostash() from sequencer.c
|
Denton Liu
|
0816f1df
|
sequencer: extract perform_autostash() from rebase
|
Derrick Stolee
|
0bbd0e8b
|
dir: refactor treat_directory to clarify control flow
|
Elijah Newren
|
16846444
|
dir: include DIR_KEEP_UNTRACKED_CONTENTS handling in treat_directory()
|
Emily Shaffer
|
d14e00c1
|
bugreport: add uname info
|
Emily Shaffer
|
27da7205
|
bugreport: add tool to generate debugging info
|
Emily Shaffer
|
dd763e68
|
help: move list_config_help to builtin/help
|
Emily Shaffer
|
efbace64
|
bugreport: gather git version and build info
|
Jiang Xin
|
bc3e2729
|
receive-pack: add new proc-receive hook
|
Jiang Xin
|
d131afc3
|
send-pack: extension for client-side status report
|
Jiang Xin
|
2c26d674
|
receive-pack: new config receive.procReceiveRefs
|
Karsten Blees
|
defd7c7b
|
dir.c: git-status --ignored: don't scan the work tree three times
|
Patrick Steinhardt
|
edc30691
|
refs: fix segfault when aborting empty transaction
|
Patrick Steinhardt
|
a65b8ac2
|
update-ref: organize commands in an array
|
Patrick Steinhardt
|
de0e0d65
|
update-ref: move transaction handling into `update_refs_stdin()`
|
Patrick Steinhardt
|
e48cf33b
|
update-ref: implement interactive transaction handling
|
Phillip Wood
|
cd5e0fd9
|
Revert "Revert "Merge branch 'ra/rebase-i-more-options'""
|
Phillip Wood
|
55c7bedb
|
rebase -i: fix --committer-date-is-author-date
|
Taylor Blau
|
fdbde82f
|
builtin/commit-graph.c: introduce split strategy 'no-merge'
|
Taylor Blau
|
8a6ac287
|
builtin/commit-graph.c: introduce split strategy 'replace'
|
efb0e3a0
|
1276
|
if (origin->commit->generation == GENERATION_NUMBER_INFINITY)
|
efb0e3a0
|
1277
|
return 1;
|
efb0e3a0
|
1279
|
filter = get_bloom_filter(r, origin->commit, 0);
|
efb0e3a0
|
1281
|
if (!filter)
|
efb0e3a0
|
1282
|
return 1;
|
efb0e3a0
|
1284
|
bloom_count_queries++;
|
efb0e3a0
|
1285
|
for (i = 0; i < bd->nr; i++) {
|
efb0e3a0
|
1286
|
if (bloom_filter_contains(filter,
|
efb0e3a0
|
1287
|
bd->keys[i],
|
efb0e3a0
|
1288
|
bd->settings))
|
efb0e3a0
|
1289
|
return 1;
|
efb0e3a0
|
1292
|
bloom_count_no++;
|
efb0e3a0
|
1293
|
return 0;
|
efb0e3a0
|
1302
|
if (bd->nr >= bd->alloc) {
|
efb0e3a0
|
1303
|
bd->alloc *= 2;
|
efb0e3a0
|
1304
|
REALLOC_ARRAY(bd->keys, bd->alloc);
|
efb0e3a0
|
1307
|
bd->keys[bd->nr] = xmalloc(sizeof(struct bloom_key));
|
efb0e3a0
|
1308
|
fill_bloom_key(path, strlen(path), bd->keys[bd->nr], bd->settings);
|
efb0e3a0
|
1309
|
bd->nr++;
|
efb0e3a0
|
2903
|
bd = xmalloc(sizeof(struct blame_bloom_data));
|
efb0e3a0
|
2905
|
bd->settings = sb->repo->objects->commit_graph->bloom_filter_settings;
|
efb0e3a0
|
2907
|
bd->alloc = 4;
|
efb0e3a0
|
2908
|
bd->nr = 0;
|
efb0e3a0
|
2909
|
ALLOC_ARRAY(bd->keys, bd->alloc);
|
efb0e3a0
|
2911
|
add_bloom_key(bd, path);
|
efb0e3a0
|
2913
|
sb->bloom_data = bd;
|
efb0e3a0
|
2920
|
for (i = 0; i < sb->bloom_data->nr; i++) {
|
efb0e3a0
|
2921
|
free(sb->bloom_data->keys[i]->hashes);
|
efb0e3a0
|
2922
|
free(sb->bloom_data->keys[i]);
|
efb0e3a0
|
2924
|
free(sb->bloom_data->keys);
|
efb0e3a0
|
2925
|
FREE_AND_NULL(sb->bloom_data);
|
efb0e3a0
|
2927
|
trace2_data_intmax("blame", sb->repo,
|
efb0e3a0
|
2929
|
trace2_data_intmax("blame", sb->repo,
|
ce6521e4
|
24
|
use_branch_desc = git_config_bool(key, value);
|
ce6521e4
|
75
|
continue;
|
ce6521e4
|
107
|
return 1;
|
ce6521e4
|
113
|
return 2;
|
ce6521e4
|
117
|
return 3;
|
ce6521e4
|
126
|
line[len - 1] = 0;
|
ce6521e4
|
167
|
origin = src;
|
ce6521e4
|
168
|
string_list_append(&src_data->generic, line);
|
ce6521e4
|
169
|
src_data->head_status |= 2;
|
ce6521e4
|
188
|
return;
|
ce6521e4
|
201
|
static void add_branch_desc(struct strbuf *out, const char *name)
|
ce6521e4
|
203
|
struct strbuf desc = STRBUF_INIT;
|
ce6521e4
|
205
|
if (!read_branch_desc(&desc, name)) {
|
ce6521e4
|
206
|
const char *bp = desc.buf;
|
ce6521e4
|
207
|
while (*bp) {
|
ce6521e4
|
208
|
const char *ep = strchrnul(bp, '\n');
|
ce6521e4
|
209
|
if (*ep)
|
ce6521e4
|
210
|
ep++;
|
ce6521e4
|
211
|
strbuf_addf(out, " : %.*s", (int)(ep - bp), bp);
|
ce6521e4
|
212
|
bp = ep;
|
ce6521e4
|
214
|
strbuf_complete_line(out);
|
ce6521e4
|
216
|
strbuf_release(&desc);
|
ce6521e4
|
217
|
}
|
ce6521e4
|
231
|
return;
|
ce6521e4
|
239
|
return;
|
ce6521e4
|
276
|
else if (people->nr)
|
ce6521e4
|
277
|
strbuf_addf(out, "%s (%d) and others",
|
ce6521e4
|
278
|
people->items[0].string,
|
ce6521e4
|
279
|
(int)util_as_integral(&people->items[0]));
|
ce6521e4
|
342
|
return;
|
ce6521e4
|
355
|
if (opts->credit_people)
|
ce6521e4
|
356
|
record_person('c', &committers, commit);
|
ce6521e4
|
372
|
string_list_append(&subjects,
|
ce6521e4
|
373
|
oid_to_hex(&commit->object.oid));
|
ce6521e4
|
387
|
add_branch_desc(out, name);
|
ce6521e4
|
425
|
subsep = ", ";
|
ce6521e4
|
426
|
strbuf_addstr(out, "HEAD");
|
ce6521e4
|
446
|
strbuf_addstr(out, subsep);
|
ce6521e4
|
447
|
print_joined("commit ", "commits ", &src_data->generic,
|
4cdae8d2
|
498
|
strbuf_addstr(&sig, "gpg verification failed.\n");
|
ce6521e4
|
507
|
if (tag_number == 2) {
|
ce6521e4
|
508
|
struct strbuf tagline = STRBUF_INIT;
|
ce6521e4
|
509
|
strbuf_addch(&tagline, '\n');
|
ce6521e4
|
510
|
strbuf_add_commented_lines(&tagline,
|
ce6521e4
|
511
|
origins.items[first_tag].string,
|
ce6521e4
|
512
|
strlen(origins.items[first_tag].string));
|
ce6521e4
|
513
|
strbuf_insert(&tagbuf, 0, tagline.buf,
|
ce6521e4
|
515
|
strbuf_release(&tagline);
|
ce6521e4
|
517
|
strbuf_addch(&tagbuf, '\n');
|
ce6521e4
|
518
|
strbuf_add_commented_lines(&tagbuf,
|
ce6521e4
|
519
|
origins.items[i].string,
|
ce6521e4
|
520
|
strlen(origins.items[i].string));
|
ce6521e4
|
521
|
fmt_tag_signature(&tagbuf, &sig, buf, len);
|
ce6521e4
|
566
|
continue;
|
brian m. carlson
|
edc6dccf
|
builtin/receive-pack: use constant-time comparison for HMAC value
|
Denton Liu
|
9460fd48
|
Lib-ify prune-packed
|
Denton Liu
|
ce6521e4
|
Lib-ify fmt-merge-msg
|
Derrick Stolee
|
efb0e3a0
|
blame: use changed-path Bloom filters
|
Derrick Stolee
|
88d2bac8
|
revision: complicated pathspecs disable filters
|
Derrick Stolee
|
e3696980
|
diff: halt tree-diff early after max_changes
|
Derrick Stolee
|
72ca4f9b
|
commit: write commit-graph with Bloom filters
|
Derrick Stolee
|
46870e1a
|
commit-graph: write commit-graph in more tests
|
Garima Singh
|
76ffbca7
|
commit-graph: write Bloom filters to commit graph file
|
Garima Singh
|
3d112755
|
commit-graph: examine commits by generation number
|
Garima Singh
|
a56b9464
|
revision.c: use Bloom filters to speed up path based revision walks
|
Garima Singh
|
ed591feb
|
bloom.c: core Bloom filter implementation for changed paths.
|
Garima Singh
|
42e50e78
|
revision.c: add trace2 stats around Bloom filter usage
|
Garima Singh
|
f1294eaf
|
bloom.c: introduce core Bloom filter constructs
|
Garima Singh
|
f97b9325
|
commit-graph: compute Bloom filters for changed paths
|
Jeff King
|
348482de
|
config: reject parsing of files over INT_MAX
|
Jeff King
|
d8410a81
|
fast-import: replace custom hash with hashmap.c
|
Jeff King
|
d21ee7d1
|
commit-graph: examine changed-path objects in pack order
|
Jonathan Tan
|
95acf11a
|
diff: restrict when prefetching occurs
|
Jonathan Tan
|
c14b6f83
|
diff: refactor object read
|
Junio C Hamano
|
4cdae8d2
|
Merge branch 'dl/libify-a-few' into jch
|
Ævar Arnfjörð Bjarmason
|
5cc044e0
|
get_short_oid: sort ambiguous objects by type, then SHA-1
|
brian m. carlson
|
910650d2
|
Rename sha1_array to oid_array
|
Damien Robert
|
1fec6fa2
|
remote.c: fix handling of %(push:remoteref)
|
Damien Robert
|
e3165570
|
remote.c: fix %(push) for triangular workflows
|
Denton Liu
|
7cd54d37
|
wrapper: indent with tabs
|
Elijah Newren
|
50ed7614
|
rebase: fix an incompatible-options error message
|
Elijah Newren
|
b9cbd295
|
rebase: reinstate --no-keep-empty
|
Elijah Newren
|
7af7a258
|
unpack-trees: add a new update_sparsity() function
|
Jeff King
|
16ddcd40
|
sha1_array: let callbacks interrupt iteration
|
Jeff King
|
ed4b804e
|
test-tool: rename sha1-array to oid-array
|
Josh Steadmon
|
3d3adaad
|
trace2: teach Git to log environment variables
|