cocci: apply the "cache.h" part of "the_repository.pending"
Apply the part of "the_repository.pending.cocci" pertaining to "cache.h". Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
7258e892d2
commit
d850b7a545
@ -94,7 +94,7 @@ static int read_patches(const char *range, struct string_list *list,
|
||||
strbuf_reset(&buf);
|
||||
}
|
||||
CALLOC_ARRAY(util, 1);
|
||||
if (get_oid(p, &util->oid)) {
|
||||
if (repo_get_oid(the_repository, p, &util->oid)) {
|
||||
error(_("could not parse commit '%s'"), p);
|
||||
FREE_AND_NULL(util);
|
||||
string_list_clear(list, 1);
|
||||
@ -390,7 +390,7 @@ static void output_pair_header(struct diff_options *diffopt,
|
||||
|
||||
if (!dashes->len)
|
||||
strbuf_addchars(dashes, '-',
|
||||
strlen(find_unique_abbrev(oid, abbrev)));
|
||||
strlen(repo_find_unique_abbrev(the_repository, oid, abbrev)));
|
||||
|
||||
if (!b_util) {
|
||||
color = color_old;
|
||||
@ -412,7 +412,7 @@ static void output_pair_header(struct diff_options *diffopt,
|
||||
strbuf_addf(buf, "%*s: %s ", patch_no_width, "-", dashes->buf);
|
||||
else
|
||||
strbuf_addf(buf, "%*d: %s ", patch_no_width, a_util->i + 1,
|
||||
find_unique_abbrev(&a_util->oid, abbrev));
|
||||
repo_find_unique_abbrev(the_repository, &a_util->oid, abbrev));
|
||||
|
||||
if (status == '!')
|
||||
strbuf_addf(buf, "%s%s", color_reset, color);
|
||||
@ -424,7 +424,7 @@ static void output_pair_header(struct diff_options *diffopt,
|
||||
strbuf_addf(buf, " %*s: %s", patch_no_width, "-", dashes->buf);
|
||||
else
|
||||
strbuf_addf(buf, " %*d: %s", patch_no_width, b_util->i + 1,
|
||||
find_unique_abbrev(&b_util->oid, abbrev));
|
||||
repo_find_unique_abbrev(the_repository, &b_util->oid, abbrev));
|
||||
|
||||
commit = lookup_commit_reference(the_repository, oid);
|
||||
if (commit) {
|
||||
|
Reference in New Issue
Block a user