strvec_push(&args,
/* could be on an unborn branch */
!strcmp("HEAD", s->revision) &&
- repo_get_oid(the_repository, "HEAD", &oid) ?
- empty_tree_oid_hex(the_repository->hash_algo) : s->revision);
- repo_get_oid(s->s.r, "HEAD", &oid) ?
- empty_tree_oid_hex(s->s.r->hash_algo) : s->revision);
++ repo_get_oid(s->r, "HEAD", &oid) ?
++ empty_tree_oid_hex(s->r->hash_algo) : s->revision);
}
color_arg_index = args.nr;
/* Use `--no-color` explicitly, just in case `diff.color = always`. */
"removed, then the edit is\n"
"aborted and the hunk is left unchanged.\n"));
- if (strbuf_edit_interactively(the_repository, &s->buf,
- if (strbuf_edit_interactively(s->s.r, &s->buf,
++ if (strbuf_edit_interactively(s->r, &s->buf,
"addp-hunk-edit.diff", NULL) < 0)
return -1;
if (file_diff->hunk_nr) {
if (rendered_hunk_index != hunk_index) {
if (use_pager) {
- setup_pager(the_repository);
- setup_pager(s->s.r);
++ setup_pager(s->r);
sigchain_push(SIGPIPE, SIG_IGN);
}
render_hunk(s, hunk, 0, colored, &s->buf);