From: Junio C Hamano <gitster@pobox.com>
To: David Turner <dturner@twopensource.com>
Cc: git@vger.kernel.org, mhagger@alum.mit.edu
Subject: Re: [PATCH 4/6] refs: replace log_ref_write with create_reflog
Date: Thu, 25 Jun 2015 09:54:22 -0700 [thread overview]
Message-ID: <xmqqmvznzq2p.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1435173388-8346-5-git-send-email-dturner@twopensource.com> (David Turner's message of "Wed, 24 Jun 2015 15:16:26 -0400")
David Turner <dturner@twopensource.com> writes:
> 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.
> 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,
next prev parent reply other threads:[~2015-06-25 16:54 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-24 19:16 [PATCH 0/6] refs backend preamble David Turner
2015-06-24 19:16 ` [PATCH 1/6] refs.c: add an err argument to log_ref_setup David Turner
2015-06-25 16:15 ` Junio C Hamano
2015-06-24 19:16 ` [PATCH 2/6] cherry-pick: Use refs infrastructure for CHERRY_PICK_HEAD David Turner
2015-06-25 16:41 ` Junio C Hamano
2015-06-24 19:16 ` [PATCH 3/6] bisect: use refs infrastructure for BISECT_START David Turner
2015-06-25 16:52 ` Junio C Hamano
2015-06-25 20:29 ` David Turner
2015-06-24 19:16 ` [PATCH 4/6] refs: replace log_ref_write with create_reflog David Turner
2015-06-25 16:54 ` Junio C Hamano [this message]
2015-06-24 19:16 ` [PATCH 5/6] git-reflog: add create and exists functions David Turner
2015-06-25 17:18 ` Junio C Hamano
2015-06-25 18:35 ` Junio C Hamano
2015-06-25 20:31 ` David Turner
2015-06-24 19:16 ` [PATCH 6/6] git-stash: use git-reflog instead of creating files David Turner
2015-06-25 13:19 ` [PATCH 0/6] refs backend preamble Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqmvznzq2p.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).