Re: [PATCH 4/6] refs: replace log_ref_write with create_reflog
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 25, 2015, 16:54 UTC
- Message-ID
- <xmqqmvznzq2p.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <1435173388-8346-5-git-send-email-dturner@twopensource.com>
David Turner <dturner@twopensource.com> writes:
Show 5 quoted lines
> In a moment, we will use this to add reflog creation commands to > git-reflog. > > Signed-off-by: David Turner <dturner@twopensource.com> > ---
The title is misleading, if this is merely renaming. I first thought with this change the current callers of log_ref_setup() would get a different/updated behaviour from the API by calling something else, but that is not the case.
Show 53 quoted lines
> builtin/checkout.c | 2 +-
> refs.c | 4 ++--
> refs.h | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/builtin/checkout.c b/builtin/checkout.c
> index ac4d10a..7549ae2 100644
> --- a/builtin/checkout.c
> +++ b/builtin/checkout.c
> @@ -629,7 +629,7 @@ 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 = create_reflog(ref_name, &log_file, &err);
> log_all_ref_updates = temp;
> strbuf_release(&log_file);
> if (ret) {
> diff --git a/refs.c b/refs.c
> index c1a563f..93412ee 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -3119,7 +3119,7 @@ static int copy_msg(char *buf, const char *msg)
> }
>
> /* This function will fill in *err and return -1 on failure */
> -int log_ref_setup(const char *refname, struct strbuf *sb_logfile, struct strbuf *err)
> +int create_reflog(const char *refname, struct strbuf *sb_logfile, struct strbuf *err)
> {
> int logfd, oflags = O_APPEND | O_WRONLY;
> char *logfile;
> @@ -3203,7 +3203,7 @@ static int log_ref_write_1(const char *refname, const unsigned char *old_sha1,
> if (log_all_ref_updates < 0)
> log_all_ref_updates = !is_bare_repository();
>
> - result = log_ref_setup(refname, sb_log_file, err);
> + result = create_reflog(refname, sb_log_file, err);
>
> if (result)
> return result;
> diff --git a/refs.h b/refs.h
> index eee99f6..d4f75a9 100644
> --- a/refs.h
> +++ b/refs.h
> @@ -233,7 +233,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 create_reflog(const char *refname, struct strbuf *logfile, struct strbuf *err);
>
> /** Reads log for the value of ref during at_time. **/
> extern int read_ref_at(const char *refname, unsigned int flags,