Skip to content

Commit f7e552d

Browse files
newrengitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0b027f6 commit f7e552d

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

cache.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,8 +1142,6 @@ enum scld_error safe_create_leading_directories_no_share(char *path);
11421142

11431143
int mkdir_in_gitdir(const char *path);
11441144
char *interpolate_path(const char *path, int real_home);
1145-
/* NEEDSWORK: remove this synonym once in-flight topics have migrated */
1146-
#define expand_user_path interpolate_path
11471145
const char *enter_repo(const char *path, int strict);
11481146
const char *remove_leading_path(const char *in, const char *prefix);
11491147
const char *relative_path(const char *in, const char *prefix, struct strbuf *sb);

gpg-interface.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1049,7 +1049,7 @@ static int sign_buffer_ssh(struct strbuf *buffer, struct strbuf *signature,
10491049
ssh_signing_key_file = strbuf_detach(&key_file->filename, NULL);
10501050
} else {
10511051
/* We assume a file */
1052-
ssh_signing_key_file = expand_user_path(signing_key, 1);
1052+
ssh_signing_key_file = interpolate_path(signing_key, 1);
10531053
}
10541054

10551055
buffer_file = mks_tempfile_t(".git_signing_buffer_tmpXXXXXX");

0 commit comments

Comments
 (0)