refs: remove `dwim_log()`

Remove `dwim_log()` in favor of `repo_dwim_log()` so that we can get rid
of one more dependency on `the_repository`.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/reflog.c b/builtin/reflog.c
index b4650cea1632f1d4b6515b65087e7b5f71afe81a..0d2ff95c6e70893d2c965348a23c3b888ef283b6 100644 (file)
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -378,7 +378,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
                char *ref;
                struct expire_reflog_policy_cb cb = { .cmd = cmd };
 
-               if (!dwim_log(argv[i], strlen(argv[i]), NULL, &ref)) {
+               if (!repo_dwim_log(the_repository, argv[i], strlen(argv[i]), NULL, &ref)) {
                        status |= error(_("%s points nowhere!"), argv[i]);
                        continue;
                }

diff --git a/reflog-walk.c b/reflog-walk.c
index f11b97e88944f79fecc623e27e88564f5a69c501..5f09552c5ca5e75fdeb2746b2b3d0c1dd57ac9d3 100644 (file)
--- a/reflog-walk.c
+++ b/reflog-walk.c
@@ -191,8 +191,8 @@ int add_reflog_for_walk(struct reflog_walk_info *info,
                reflogs = read_complete_reflog(branch);
                if (!reflogs || reflogs->nr == 0) {
                        char *b;
-                       int ret = dwim_log(branch, strlen(branch),
-                                          NULL, &b);
+                       int ret = repo_dwim_log(the_repository, branch, strlen(branch),
+                                               NULL, &b);
                        if (ret > 1)
                                free(b);
                        else if (ret == 1) {

diff --git a/reflog.c b/reflog.c
index 8861c2d60666189a9e795a2a0484064ec6554706..3c80950186b6c30cd0fca7e6e2fc21fa7939d71f 100644 (file)
--- a/reflog.c
+++ b/reflog.c
@@ -409,7 +409,7 @@ int reflog_delete(const char *rev, enum expire_reflog_flags flags, int verbose)
        if (!spec)
                return error(_("not a reflog: %s"), rev);
 
-       if (!dwim_log(rev, spec - rev, NULL, &ref)) {
+       if (!repo_dwim_log(the_repository, rev, spec - rev, NULL, &ref)) {
                status |= error(_("no reflog for '%s'"), rev);
                goto cleanup;
        }

diff --git a/refs.c b/refs.c
index 83cd965a264685c988b6f4f76860e5346a0613b6..43c5fef734eefc00da2f83aca1fa8f173e9fc84d 100644 (file)
--- a/refs.c
+++ b/refs.c
@@ -775,11 +775,6 @@ int repo_dwim_log(struct repository *r, const char *str, int len,
        return logs_found;
 }
 
-int dwim_log(const char *str, int len, struct object_id *oid, char **log)
-{
-       return repo_dwim_log(the_repository, str, len, oid, log);
-}
-
 int is_per_worktree_ref(const char *refname)
 {
        return starts_with(refname, "refs/worktree/") ||

diff --git a/refs.h b/refs.h
index e906dbb44ac2a02a00b800e95dce83f849ea6a91..82022d300cb7581e0c674a8e8091811bc577defb 100644 (file)
--- a/refs.h
+++ b/refs.h
@@ -164,7 +164,6 @@ int expand_ref(struct repository *r, const char *str, int len, struct object_id
 int repo_dwim_ref(struct repository *r, const char *str, int len,
                  struct object_id *oid, char **ref, int nonfatal_dangling_mark);
 int repo_dwim_log(struct repository *r, const char *str, int len, struct object_id *oid, char **ref);
-int dwim_log(const char *str, int len, struct object_id *oid, char **ref);
 
 /*
  * Retrieves the default branch name for newly-initialized repositories.