Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-cache-h
* ab/remove-implicit-use-of-the-repository: libs: use "struct repository *" argument, not "the_repository" post-cocci: adjust comments for recent repo_* migration cocci: apply the "revision.h" part of "the_repository.pending" cocci: apply the "rerere.h" part of "the_repository.pending" cocci: apply the "refs.h" part of "the_repository.pending" cocci: apply the "promisor-remote.h" part of "the_repository.pending" cocci: apply the "packfile.h" part of "the_repository.pending" cocci: apply the "pretty.h" part of "the_repository.pending" cocci: apply the "object-store.h" part of "the_repository.pending" cocci: apply the "diff.h" part of "the_repository.pending" cocci: apply the "commit.h" part of "the_repository.pending" cocci: apply the "commit-reach.h" part of "the_repository.pending" cocci: apply the "cache.h" part of "the_repository.pending" cocci: add missing "the_repository" macros to "pending" cocci: sort "the_repository" rules by header cocci: fix incorrect & verbose "the_repository" rules cocci: remove dead rule from "the_repository.pending.cocci"
This commit is contained in:
@ -66,20 +66,20 @@ int cmd_range_diff(int argc, const char **argv, const char *prefix)
|
||||
|
||||
if (dash_dash == 3 ||
|
||||
(dash_dash < 0 && argc > 2 &&
|
||||
!get_oid_committish(argv[0], &oid) &&
|
||||
!get_oid_committish(argv[1], &oid) &&
|
||||
!get_oid_committish(argv[2], &oid))) {
|
||||
!repo_get_oid_committish(the_repository, argv[0], &oid) &&
|
||||
!repo_get_oid_committish(the_repository, argv[1], &oid) &&
|
||||
!repo_get_oid_committish(the_repository, argv[2], &oid))) {
|
||||
if (dash_dash < 0)
|
||||
; /* already validated arguments */
|
||||
else if (get_oid_committish(argv[0], &oid))
|
||||
else if (repo_get_oid_committish(the_repository, argv[0], &oid))
|
||||
usage_msg_optf(_("not a revision: '%s'"),
|
||||
builtin_range_diff_usage, options,
|
||||
argv[0]);
|
||||
else if (get_oid_committish(argv[1], &oid))
|
||||
else if (repo_get_oid_committish(the_repository, argv[1], &oid))
|
||||
usage_msg_optf(_("not a revision: '%s'"),
|
||||
builtin_range_diff_usage, options,
|
||||
argv[1]);
|
||||
else if (get_oid_committish(argv[2], &oid))
|
||||
else if (repo_get_oid_committish(the_repository, argv[2], &oid))
|
||||
usage_msg_optf(_("not a revision: '%s'"),
|
||||
builtin_range_diff_usage, options,
|
||||
argv[2]);
|
||||
|
Reference in New Issue
Block a user