cocci: apply rules to rewrite callers of "refs" interfaces
Apply the rules that rewrite callers of "refs" interfaces to explicitly pass `struct ref_store`. The resulting patch has been applied with the `--whitespace=fix` option. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
b198ee0b3d
commit
2e5c4758b7
@ -18,7 +18,8 @@ static int check_symref(const char *HEAD, int quiet, int shorten, int recurse, i
|
||||
const char *refname;
|
||||
|
||||
resolve_flags = (recurse ? 0 : RESOLVE_REF_NO_RECURSE);
|
||||
refname = resolve_ref_unsafe(HEAD, resolve_flags, NULL, &flag);
|
||||
refname = refs_resolve_ref_unsafe(get_main_ref_store(the_repository),
|
||||
HEAD, resolve_flags, NULL, &flag);
|
||||
|
||||
if (!refname)
|
||||
die("No such ref: %s", HEAD);
|
||||
@ -31,7 +32,9 @@ static int check_symref(const char *HEAD, int quiet, int shorten, int recurse, i
|
||||
if (print) {
|
||||
char *to_free = NULL;
|
||||
if (shorten)
|
||||
refname = to_free = shorten_unambiguous_ref(refname, 0);
|
||||
refname = to_free = refs_shorten_unambiguous_ref(get_main_ref_store(the_repository),
|
||||
refname,
|
||||
0);
|
||||
puts(refname);
|
||||
free(to_free);
|
||||
}
|
||||
@ -66,7 +69,8 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
|
||||
die("Cannot delete %s, not a symbolic ref", argv[0]);
|
||||
if (!strcmp(argv[0], "HEAD"))
|
||||
die("deleting '%s' is not allowed", argv[0]);
|
||||
return delete_ref(NULL, argv[0], NULL, REF_NO_DEREF);
|
||||
return refs_delete_ref(get_main_ref_store(the_repository),
|
||||
NULL, argv[0], NULL, REF_NO_DEREF);
|
||||
}
|
||||
|
||||
switch (argc) {
|
||||
@ -79,7 +83,8 @@ int cmd_symbolic_ref(int argc, const char **argv, const char *prefix)
|
||||
die("Refusing to point HEAD outside of refs/");
|
||||
if (check_refname_format(argv[1], REFNAME_ALLOW_ONELEVEL) < 0)
|
||||
die("Refusing to set '%s' to invalid ref '%s'", argv[0], argv[1]);
|
||||
ret = !!create_symref(argv[0], argv[1], msg);
|
||||
ret = !!refs_create_symref(get_main_ref_store(the_repository),
|
||||
argv[0], argv[1], msg);
|
||||
break;
|
||||
default:
|
||||
usage_with_options(git_symbolic_ref_usage, options);
|
||||
|
||||
Reference in New Issue
Block a user