reftable: implement refname validation

[thirdparty/git.git] / sequencer.c

diff --git a/sequencer.c b/sequencer.c
index 0bec01cf38e8173c930b84250a61e84eb0c6963b..7483ee3a76de4a973559af43c70feed14ba94d75 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -1241,7 +1241,7 @@ N_("Your name and email address were configured automatically based\n"
 
 static const char *implicit_ident_advice(void)
 {
-       char *user_config = expand_user_path("~/.gitconfig", 0);
+       char *user_config = interpolate_path("~/.gitconfig", 0);
        char *xdg_config = xdg_config_home("config");
        int config_exists = file_exists(user_config) || file_exists(xdg_config);
 
@@ -3521,6 +3521,7 @@ static int do_exec(struct repository *r, const char *command_line)
        return status;
 }
 
+__attribute__((format (printf, 2, 3)))
 static int safe_append(const char *filename, const char *fmt, ...)
 {
        va_list ap;
@@ -3598,8 +3599,27 @@ static int do_label(struct repository *r, const char *name, int len)
        return ret;
 }
 
+__attribute__((format (printf, 3, 4)))
 static const char *reflog_message(struct replay_opts *opts,
-       const char *sub_action, const char *fmt, ...);
+       const char *sub_action, const char *fmt, ...)
+{
+       va_list ap;
+       static struct strbuf buf = STRBUF_INIT;
+       char *reflog_action = getenv(GIT_REFLOG_ACTION);
+
+       va_start(ap, fmt);
+       strbuf_reset(&buf);
+       strbuf_addstr(&buf, reflog_action ? reflog_action : action_name(opts));
+       if (sub_action)
+               strbuf_addf(&buf, " (%s)", sub_action);
+       if (fmt) {
+               strbuf_addstr(&buf, ": ");
+               strbuf_vaddf(&buf, fmt, ap);
+       }
+       va_end(ap);
+
+       return buf.buf;
+}
 
 static int do_reset(struct repository *r,
                    const char *name, int len,
@@ -4178,27 +4198,6 @@ int apply_autostash_oid(const char *stash_oid)
        return apply_save_autostash_oid(stash_oid, 1);
 }
 
-static const char *reflog_message(struct replay_opts *opts,
-       const char *sub_action, const char *fmt, ...)
-{
-       va_list ap;
-       static struct strbuf buf = STRBUF_INIT;
-       char *reflog_action = getenv(GIT_REFLOG_ACTION);
-
-       va_start(ap, fmt);
-       strbuf_reset(&buf);
-       strbuf_addstr(&buf, reflog_action ? reflog_action : action_name(opts));
-       if (sub_action)
-               strbuf_addf(&buf, " (%s)", sub_action);
-       if (fmt) {
-               strbuf_addstr(&buf, ": ");
-               strbuf_vaddf(&buf, fmt, ap);
-       }
-       va_end(ap);
-
-       return buf.buf;
-}
-
 static int run_git_checkout(struct repository *r, struct replay_opts *opts,
                            const char *commit, const char *action)
 {