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 v3 4/7] refs: Break out check for reflog autocreation
Date: Fri, 26 Jun 2015 15:01:14 -0700 [thread overview]
Message-ID: <xmqqpp4iruxh.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1435278548-3790-4-git-send-email-dturner@twopensource.com> (David Turner's message of "Thu, 25 Jun 2015 20:29:05 -0400")
David Turner <dturner@twopensource•com> writes:
> This is just for clarity.
>
> Signed-off-by: David Turner <dturner@twopensource•com>
> ---
> refs.c | 14 +++++++++-----
> 1 file changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/refs.c b/refs.c
> index b34a54a..dff91cf 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -3118,6 +3118,14 @@ static int copy_msg(char *buf, const char *msg)
> return cp - buf;
> }
>
> +static int should_autocreate_reflog(const char *refname)
> +{
> + return starts_with(refname, "refs/heads/") ||
> + starts_with(refname, "refs/remotes/") ||
> + starts_with(refname, "refs/notes/") ||
> + !strcmp(refname, "HEAD");
> +}
> +
> /* 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)
> {
> @@ -3128,11 +3136,7 @@ int log_ref_setup(const char *refname, struct strbuf *sb_logfile, struct strbuf
> logfile = sb_logfile->buf;
> /* make sure the rest of the function can't change "logfile" */
> sb_logfile = NULL;
> - if (log_all_ref_updates &&
> - (starts_with(refname, "refs/heads/") ||
> - starts_with(refname, "refs/remotes/") ||
> - starts_with(refname, "refs/notes/") ||
> - !strcmp(refname, "HEAD"))) {
> + if (log_all_ref_updates && should_autocreate_reflog(refname)) {
This makes me wonder if "log_all_ref_updates &&" part should also be
inside the helper. The use of the new helper in 5/7 tells me that
it is the case, I would say.
Besides, the answer to the question "should we auto-create reflog?"
is "if we are told to log all, and then the thing is one of these,
then we should:", so it is natural from the name of the new helper
that "log_all_ref_updates &&" should be in there ;-)
next prev parent reply other threads:[~2015-06-26 22:01 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-26 0:29 [PATCH v3 1/7] refs.c: add err arguments to reflog functions David Turner
2015-06-26 0:29 ` [PATCH v3 2/7] cherry-pick: treat CHERRY_PICK_HEAD and REVERT_HEAD as refs David Turner
2015-06-26 21:42 ` Junio C Hamano
2015-06-26 0:29 ` [PATCH v3 3/7] bisect: treat BISECT_HEAD as a ref David Turner
2015-06-26 21:46 ` Junio C Hamano
2015-06-26 0:29 ` [PATCH v3 4/7] refs: Break out check for reflog autocreation David Turner
2015-06-26 22:01 ` Junio C Hamano [this message]
2015-06-26 0:29 ` [PATCH v3 5/7] refs: add safe_create_reflog function David Turner
2015-06-26 22:12 ` Junio C Hamano
2015-06-26 0:29 ` [PATCH v3 6/7] git-reflog: add create and exists functions David Turner
2015-06-26 0:29 ` [PATCH v3 7/7] git-stash: use git-reflog instead of creating files David Turner
2015-06-26 22:14 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqpp4iruxh.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=dturner@twopensource$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=mhagger@alum$(echo .)mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox