pu 1feae2a559816e6df62e994d4ffdc226dee6631a
jch 1605b8c0b5622510a96ef6a358adbd142cf8222e
next 5d7573a151b918062087822a2f0d7661dc4bd707
master aa25c82427ae70aebf3b8f970f2afd54e9a2a8c6
master@{1} ab15ad1a3b4b04a29415aef8c9afa2f64fc194a2

Uncovered code in 'pu' not in 'jch'

pu 1feae2a559816e6df62e994d4ffdc226dee6631a
jch 1605b8c0b5622510a96ef6a358adbd142cf8222e

blame.c

170072f9 846 (result[i] >= most_certain_line_a ||
170072f9 847 second_best_result[i] >= most_certain_line_a)) {
170072f9 848 certainties[i] = CERTAINTY_NOT_CALCULATED;
170072f9 951 max_search_distance_b = 0;
1fc73384 998 return;
8934ac8c 1190 ent->ignored == next->ignored &&
8934ac8c 1191 ent->unblamable == next->unblamable) {
43885768 1607 continue;
ae3f36de 2425 continue;

builtin/blame.c

ae3f36de 716 return ret;

builtin/cat-file.c

e265069a 528 warning("This repository uses promisor remotes. Some objects may not be loaded.");

builtin/fetch-pack.c

bf01639c 249 warning(_("Lockfile created but not reported: %s"),
bf01639c 250 pack_lockfiles.items[i].string);

builtin/pack-objects.c

820a5361 858 BUG("configured exclusion wasn't configured");
820a5361 2795 die(_("value of uploadpack.blobpackfileuri must be "
820a5361 2798 die(_("object already configured in another "

builtin/rebase.c

d559f502 759 ret = error(_("could not remove '%s'"),
d559f502 1675 error(_("could not remove '%s'"),

builtin/remote.c

f39a9c65 1551 die(_("--save-to-push cannot be used with other options"));
f39a9c65 1575 die(_("--save-to-push can only be used when only one url is defined"));

fetch-pack.c

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);

http-fetch.c

472fbef8 75 die("couldn't create http pack request");
472fbef8 82 die("Unable to get pack file %s\n%s", preq->url,
472fbef8 86 die("Unable to start request");
472fbef8 101 walker_targets_free(commits, commit_id, write_ref);
472fbef8 104 fprintf(stderr,

http.c

ee334603 2302 target ? hash_to_hex(target->hash) : base_url,

oidset.c

f93895f8 69 die_errno("Could not read '%s'", path);

promisor-remote.c

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);

protocol.c

6da1f1a9 37 die(_("Unrecognized protocol version"));
6da1f1a9 39 die(_("Unrecognized protocol_version"));
6da1f1a9 74 BUG("late attempt to register an allowed protocol version");

ref-filter.c

2582083f 93 keydata_aka_refname ? keydata_aka_refname : k->wt->head_ref);

remote-curl.c

6da1f1a9 345 return 0;

sequencer.c

37e9ee5c 293 ret = -1;
37e9ee5c 311 ret = error(_("could not remove '%s'"), buf.buf);

upload-pack.c

a8d662e3 130 return readsz;
820a5361 149 BUG("packfile_uris requires sideband-all");
a8d662e3 355 send_client_data(1, output_state.buffer, output_state.used);
820a5361 1386 string_list_clear(&data->uri_protocols, 0);

wrapper.c

5efde212 70 die("Out of memory, malloc failed (tried to allocate %" PRIuMAX " bytes)",
5efde212 73 error("Out of memory, malloc failed (tried to allocate %" PRIuMAX " bytes)",

Commits introducing uncovered code:

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
Barret Rhoden f93895f8 Move oidset_parse_file() to oidset.c
Christian Couder 7b6e1b04 Move core_partial_clone_filter_default to promisor-remote.c
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 54248706 Add initial support for many promisor remotes
Christian Couder 0ba08c05 Remove fetch-object.{c,h} in favor of promisor-remote.{c,h}
Christian Couder e265069a Use promisor_remote_get_direct() and has_promisor_remote()
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 bf01639c fetch-pack: support more than one pack lockfile
Jonathan Tan a8d662e3 upload-pack: refactor reading of pack-objects out
Jonathan Tan 820a5361 upload-pack: send part of packfile response as uri
Josh Steadmon 6da1f1a9 protocol: advertise multiple supported versions
Junio C Hamano ee334603 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
Nickolai Belakovski 2582083f ref-filter: add worktreepath atom
Phillip Wood d559f502 rebase --abort/--quit: cleanup refs/rewritten
Phillip Wood 37e9ee5c sequencer: return errors from sequencer_remove_state()

Uncovered code in 'jch' not in 'next'

jch 1605b8c0b5622510a96ef6a358adbd142cf8222e
next 5d7573a151b918062087822a2f0d7661dc4bd707

builtin/branch.c

1fde99cf 833 die(_("The -a, and -r, options to 'git branch' do not take a branch name.\n"

builtin/checkout.c

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);

builtin/commit.c

efeb229e 1674 return 1;

builtin/gc.c

efeb229e 691 return 1;

builtin/rebase.c

526c03b5 1262 goto done;
10572de1 1278 goto done;

commit-graph.c

d83160e8 906 error(_("error opening index for %s"), packname.buf);
d83160e8 907 return 1;
63a8be62 946 continue;
93ba1867 969 display_progress(ctx->progress, ctx->approx_nr_objects);
8520d7fc 1039 error(_("unable to create leading directories of %s"),
8520d7fc 1041 return errno;
efeb229e 1158 error(_("the commit graph format cannot write %d commits"), count_distinct);
efeb229e 1159 res = 1;
efeb229e 1160 goto cleanup;
efeb229e 1169 error(_("too many commits to write graph"));
efeb229e 1170 res = 1;
efeb229e 1171 goto cleanup;

read-cache.c

ee70c128 1723 if (advice_unknown_index_extension) {
ee70c128 1724 warning(_("ignoring optional %.4s index extension"), ext);
ee70c128 1725 advise(_("This is likely due to the file having been written by a newer\n"

Commits introducing uncovered code:

Denton Liu 526c03b5 rebase: refactor can_fast_forward into goto tower
Denton Liu 10572de1 rebase: fast-forward --onto in more cases
Derrick Stolee efeb229e commit-graph: return with errors during write
Derrick Stolee d83160e8 commit-graph: extract fill_oids_from_packs()
Derrick Stolee 63a8be62 commit-graph: extract fill_oids_from_commit_hex()
Derrick Stolee 93ba1867 commit-graph: extract fill_oids_from_all_packs()
Derrick Stolee 8520d7fc commit-graph: extract write_commit_graph_file()
Jonathan Nieder ee70c128 index: offer advice for unknown index extensions
Nguyễn Thái Ngọc Duy a5e5f399 restore: replace --force with --ignore-unmerged
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 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 c9c935f6 restore: take tree-ish from --source option instead
Nguyễn Thái Ngọc Duy e3ddd3b5 restore: reject invalid combinations with --staged
Nguyễn Thái Ngọc Duy 183fb44f restore: add --worktree and --staged
Nguyễn Thái Ngọc Duy 3ec37ad1 switch: add --discard-changes
Nguyễn Thái Ngọc Duy 2f0896ec restore: support --patch
Philip Oakley 1fde99cf doc branch: provide examples for listing remote tracking branches

Uncovered code in 'next' not in 'master'

next 5d7573a151b918062087822a2f0d7661dc4bd707
master aa25c82427ae70aebf3b8f970f2afd54e9a2a8c6

builtin/am.c

97387c8b 1662 die("unable to read from stdin; aborting");
6e7baf24 2336 die(_("interactive mode requires patches on the command line"));

builtin/bisect--helper.c

7877ac3d 574 retval = error(_("invalid ref: '%s'"), start_head.buf);
7877ac3d 575 goto finish;

builtin/fast-export.c

e80001f8 81 static int parse_opt_reencode_mode(const struct option *opt,
e80001f8 84 if (unset) {
e80001f8 85 reencode_mode = REENCODE_ABORT;
e80001f8 86 return 0;
e80001f8 89 switch (git_parse_maybe_bool(arg)) {
e80001f8 91 reencode_mode = REENCODE_NO;
e80001f8 92 break;
e80001f8 94 reencode_mode = REENCODE_YES;
e80001f8 95 break;
e80001f8 97 if (!strcasecmp(arg, "abort"))
e80001f8 98 reencode_mode = REENCODE_ABORT;
e80001f8 100 return error("Unknown reencoding mode: %s", arg);
e80001f8 103 return 0;
e80001f8 665 switch(reencode_mode) {
e80001f8 667 reencoded = reencode_string(message, "UTF-8", encoding);
e80001f8 668 break;
e80001f8 670 break;
e80001f8 672 die("Encountered commit-specific encoding %s in commit "
e80001f8 674 encoding, oid_to_hex(&commit->object.oid));
ccbfc96d 686 printf("encoding %s\n", encoding);

builtin/index-pack.c

8a30a1ef 1365 continue;

builtin/log.c

13cdf780 873 return 0;

builtin/merge.c

f3f8311e 1290 usage_msg_opt(_("--quit expects no arguments"),

builtin/rebase.c

4c785c0e 1201 opts->flags &= ~REBASE_DIFFSTAT;

builtin/worktree.c

1de16aec 297 BUG("How come '%s' becomes empty after sanitization?", sb.buf);

builtin/write-tree.c

76a7bc09 53 die("%s: prefix %s not found", me, tree_prefix);

diff.c

8ef05193 5217 return error(_("%s expects a numerical value"), "--unified");

fast-import.c

3edfcc65 2612 read_next_command();
3edfcc65 2679 strbuf_addf(&new_data,

grep.c

de99eb0c 1784 BUG("grep call which could print a name requires "

parse-options-cb.c

f7e68a08 20 return error(_("option `%s' expects a numerical value"),

parse-options.c

f7e68a08 199 return error(_("%s expects a numerical value"),

progress.c

1aed1a5f 131 cols - progress->title_len - 1 : 0;

read-cache.c

7bd9631b 2201 src_offset += load_cache_entries_threaded(istate, mmap, mmap_size, nr_threads, ieot);

refs.c

1de16aec 111 sanitized->buf[sanitized->len-1] = '-';
1de16aec 170 if (sanitized)
1de16aec 171 strbuf_addch(sanitized, '-');
1de16aec 173 return -1;
1de16aec 178 strbuf_complete(sanitized, '/');
1de16aec 215 BUG("sanitizing refname '%s' check returned error", refname);

server-info.c

f4f476b6 110 ret = -1;
f4f476b6 111 goto out;
f4f476b6 123 goto out;
f4f476b6 125 goto out;
f4f476b6 134 if (uic.cur_fp)
f4f476b6 135 fclose(uic.cur_fp);

trace2/tr2_tls.c

5fdae9d3 87 return pthread_getspecific(tr2tls_key) == tr2tls_thread_main;

Commits introducing uncovered code:

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 Hostetler 5fdae9d3 trace2: fix tracing when NO_PTHREADS is defined
Jeff King 7bd9631b read-cache: drop unused parameter from threaded load
Jeff King 76a7bc09 cmd_{read,write}_tree: rename "unused" variable that is used
Jeff King 97387c8b am: read interactive input from stdin
Jeff King 6e7baf24 am: drop tty requirement for --interactive
Johannes Schindelin 7877ac3d bisect--helper: verify HEAD could be parsed before continuing
Johannes Schindelin 4c785c0e rebase: replace incorrect logical negation by correct bitwise one
Jonathan Tan 8a30a1ef index-pack: prefetch missing REF_DELTA bases
Nguyễn Thái Ngọc Duy f3f8311e merge: add --quit
Nguyễn Thái Ngọc Duy 8ef05193 diff-parseopt: restore -U (no argument) behavior
Nguyễn Thái Ngọc Duy f7e68a08 parse-options: check empty value in OPT_INTEGER and OPT_ABBREV
Nguyễn Thái Ngọc Duy 1de16aec worktree add: sanitize worktree names
SZEDER Gábor 1aed1a5f progress: avoid empty line when breaking the progress line

Uncovered code in 'master' not in 'master@{1}'

master aa25c82427ae70aebf3b8f970f2afd54e9a2a8c6
master@{1} ab15ad1a3b4b04a29415aef8c9afa2f64fc194a2

builtin/difftool.c

f3a3a021 731 die(_("--dir-diff is incompatible with --no-index"));

http.c

5c3d5a38 2329 return posn / eltsize;

parse-options.c

5c387428 282 return 0;
5c387428 481 BUG("OPT_ALIAS() should not remain at this point. "
5c387428 661 BUG("An alias must have long option name");
5c387428 670 BUG("No please. Nested aliases are not supported.");
5c387428 685 BUG("could not find source option '%s' of alias '%s'",

sha1-name.c

af96fe33 161 return;

t/helper/test-read-cache.c

dc76852d 29 die("%s not in index", name);

upload-pack.c

8e712ef6 1073 precomposed_unicode = git_config_bool(var, value);

Commits introducing uncovered code:

Derrick Stolee af96fe33 midx: add packs to packed_git linked list
Elijah Newren 8e712ef6 Honor core.precomposeUnicode in more places
Johannes Schindelin f3a3a021 difftool --no-index: error out on --dir-diff (and don't crash)
Johannes Schindelin dc76852d fsmonitor: demonstrate that it is not refreshed after discard_index()
Mike Hommey 5c3d5a38 Make fread/fwrite-like functions in http.c more like fread/fwrite.
Nguyễn Thái Ngọc Duy 5c387428 parse-options: don't emit "ambiguous option" for aliases