David Turner <dtur...@twopensource.com> writes:
> Make log_ref_setup private, and add public safe_create_reflog which
> calls log_ref_setup.
>
> In a moment, we will use safe_create_reflog to add reflog creation
> commands to git-reflog.
>
> Signed-off-by: David Turner <dtur...@twopensource.com>
> ---
> builtin/checkout.c | 4 +---
> refs.c | 11 +++++++++++
> refs.h | 2 +-
> 3 files changed, 13 insertions(+), 4 deletions(-)
>
> diff --git a/builtin/checkout.c b/builtin/checkout.c
> index 93f63d3..b793670 100644
> --- a/builtin/checkout.c
> +++ b/builtin/checkout.c
> @@ -621,7 +621,6 @@ static void update_refs_for_switch(const struct
> checkout_opts *opts,
> if (opts->new_orphan_branch) {
> if (opts->new_branch_log && !log_all_ref_updates) {
> int temp;
> - struct strbuf log_file = STRBUF_INIT;
> int ret;
> const char *ref_name;
> struct strbuf err = STRBUF_INIT;
> @@ -629,9 +628,8 @@ static void update_refs_for_switch(const struct
> checkout_opts *opts,
> ref_name = mkpath("refs/heads/%s",
> opts->new_orphan_branch);
> temp = log_all_ref_updates;
> log_all_ref_updates = 1;
> - ret = log_ref_setup(ref_name, &log_file, &err);
> + ret = safe_create_reflog(ref_name, &err);
> log_all_ref_updates = temp;
> - strbuf_release(&log_file);
> if (ret) {
> fprintf(stderr, _("Can not do reflog
> for '%s'. %s\n"),
> opts->new_orphan_branch,
> err.buf);
Yup, much nicer ;-)
> diff --git a/refs.c b/refs.c
> index de7b5ef..7b02c45 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -3171,6 +3171,17 @@ int log_ref_setup(const char *refname, struct strbuf
> *sb_logfile, struct strbuf
> return 0;
> }
>
> +
> +int safe_create_reflog(const char *refname, struct strbuf *err)
> +{
> + int ret;
> + struct strbuf sb = STRBUF_INIT;
> +
> + ret = log_ref_setup(refname, &sb, err);
> + strbuf_release(&sb);
> + return ret;
> +}
> +
> static int log_ref_write_fd(int fd, const unsigned char *old_sha1,
> const unsigned char *new_sha1,
> const char *committer, const char *msg)
> diff --git a/refs.h b/refs.h
> index debdefc..2986aac 100644
> --- a/refs.h
> +++ b/refs.h
> @@ -228,7 +228,7 @@ int pack_refs(unsigned int flags);
> /*
> * Setup reflog before using. Fill in err and return -1 on failure.
> */
> -int log_ref_setup(const char *refname, struct strbuf *logfile, struct strbuf
> *err);
> +int safe_create_reflog(const char *refname, struct strbuf *err);
>
> /** Reads log for the value of ref during at_time. **/
> extern int read_ref_at(const char *refname, unsigned int flags,
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
