cache.h: remove expand_user_path()

expand_user_path() was renamed to interpolate_path() back in mid-2021,
but reinstated with a #define and a NEEDSWORK comment that we would
eventually want to get rid of it.  Do so now.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/cache.h b/cache.h
index 260203c7a620c6b3256f55babd7f872b9b96f938..978aa01712b4f08ee347e55296314c696f1ad567 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1142,8 +1142,6 @@ enum scld_error safe_create_leading_directories_no_share(char *path);
 
 int mkdir_in_gitdir(const char *path);
 char *interpolate_path(const char *path, int real_home);
-/* NEEDSWORK: remove this synonym once in-flight topics have migrated */
-#define expand_user_path interpolate_path
 const char *enter_repo(const char *path, int strict);
 const char *remove_leading_path(const char *in, const char *prefix);
 const char *relative_path(const char *in, const char *prefix, struct strbuf *sb);

diff --git a/gpg-interface.c b/gpg-interface.c
index 632265691e5abadce1a9a216fda6fb336cbdfb06..f9c5b6c3f531f4ec181ebc89bc950544edb3b250 100644 (file)
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -1049,7 +1049,7 @@ static int sign_buffer_ssh(struct strbuf *buffer, struct strbuf *signature,
                ssh_signing_key_file = strbuf_detach(&key_file->filename, NULL);
        } else {
                /* We assume a file */
-               ssh_signing_key_file = expand_user_path(signing_key, 1);
+               ssh_signing_key_file = interpolate_path(signing_key, 1);
        }
 
        buffer_file = mks_tempfile_t(".git_signing_buffer_tmpXXXXXX");