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 5/7] refs: add safe_create_reflog function
Date: Fri, 26 Jun 2015 15:12:58 -0700 [thread overview]
Message-ID: <xmqqlhf6rudx.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1435278548-3790-5-git-send-email-dturner@twopensource.com> (David Turner's message of "Thu, 25 Jun 2015 20:29:06 -0400")
David Turner <dturner@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 <dturner@twopensource•com>
> ---
> @@ -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, 0);
> log_all_ref_updates = temp;
> - strbuf_release(&log_file);
What the result of applying this patch does around here is
incoherent, isn't it? I do understand and agree that adding the
"force-create" argument to safe_create_reflog() is a good idea, but
then I do not think you need to temporarily set log-all-ref-updates
while calling it (and revert it afterwards). Not having to do that
is the whole point of "force-create", isn't it?
> diff --git a/refs.c b/refs.c
> index dff91cf..7519dac 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -3123,11 +3123,12 @@ 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, "refs/stash") ||
> !strcmp(refname, "HEAD");
> }
This change is *not* part of creating safe-create-reflog.
It may be part of "allowing us to use safe_create_reflog() to manage
stash", but I'd imagine that a new "reflog create" command should
ignore log-all-ref-updates settings (after all, the end user is
explicitly telling us to create one by issuing a command), so I
doubt it matters if 'stash' is on the auto-create list.
> /* 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)
> +static int log_ref_setup(const char *refname, struct strbuf *sb_logfile, struct strbuf *err, int force_create)
> {
> int logfd, oflags = O_APPEND | O_WRONLY;
> char *logfile;
> @@ -3136,7 +3137,8 @@ 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 && should_autocreate_reflog(refname)) {
> + if (log_all_ref_updates &&
> + (force_create || should_autocreate_reflog(refname))) {
With this patch, force_create is used as "we are throwing you an
unusual name that do not automatically get a reflog when log-all is
set, and we are overriding that selection-by-name aspect of auto
creation" but does not defeat log-all settings. Is that intended?
If somebody asks safe_create_reflog() to create a reflog and passes
force_create, shouldn't we create that reflog regardless of
log_all_ref_updates settings? That is
if (force_create || should_autocreate_reflog(refname)) {
... create it ...
would be more natural to read here, and you would get that for free
if 4/7 checked log_all_ref_updates in should_autocreate_reflog().
next prev parent reply other threads:[~2015-06-26 22:13 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
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 [this message]
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=xmqqlhf6rudx.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