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
@ -116,7 +116,7 @@ static int parse_next_oid(const char **next, const char *end,
|
||||
(*next)++;
|
||||
*next = parse_arg(*next, &arg);
|
||||
if (arg.len) {
|
||||
if (get_oid(arg.buf, oid))
|
||||
if (repo_get_oid(the_repository, arg.buf, oid))
|
||||
goto invalid;
|
||||
} else {
|
||||
/* Without -z, an empty value means all zeros: */
|
||||
@ -134,7 +134,7 @@ static int parse_next_oid(const char **next, const char *end,
|
||||
*next += arg.len;
|
||||
|
||||
if (arg.len) {
|
||||
if (get_oid(arg.buf, oid))
|
||||
if (repo_get_oid(the_repository, arg.buf, oid))
|
||||
goto invalid;
|
||||
} else if (flags & PARSE_SHA1_ALLOW_EMPTY) {
|
||||
/* With -z, treat an empty value as all zeros: */
|
||||
@ -549,7 +549,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
|
||||
refname = argv[0];
|
||||
value = argv[1];
|
||||
oldval = argv[2];
|
||||
if (get_oid(value, &oid))
|
||||
if (repo_get_oid(the_repository, value, &oid))
|
||||
die("%s: not a valid SHA1", value);
|
||||
}
|
||||
|
||||
@ -560,7 +560,7 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
|
||||
* must not already exist:
|
||||
*/
|
||||
oidclr(&oldoid);
|
||||
else if (get_oid(oldval, &oldoid))
|
||||
else if (repo_get_oid(the_repository, oldval, &oldoid))
|
||||
die("%s: not a valid old SHA1", oldval);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user