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 1/9] refs: Introduce pseudoref and per-worktree ref concepts
Date: Fri, 24 Jul 2015 12:20:42 -0700 [thread overview]
Message-ID: <xmqqio99mkfp.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1437713129-19373-2-git-send-email-dturner@twopensource.com> (David Turner's message of "Fri, 24 Jul 2015 00:45:21 -0400")
David Turner <dturner@twopensource•com> writes:
> +[[def_pseudoref]]pseudoref::
> + Files under `$GIT_DIR` whose names are all-caps, and that
> + contain a line consisting of a <<def_sha1,SHA-1>> followed by
> + a newline, and optionally some additional data. `MERGE_HEAD`
> + and `CHERRY_PICK_HEAD` are examples. Unlike...
I wonder if you meant to include FETCH_HEAD in this category (I am
not complaining about not having it listed as an example). If you
did mean to include FETCH_HEAD, then "followed-by a newline" must
be rethought.
Documentation pedant might say that the above definition would throw
HEAD into this category. s/all-caps,/all-caps (except "HEAD"),/ or
something like that may be needed to prevent them from making useless
noise.
> diff --git a/refs.c b/refs.c
> index 0b96ece..d31ca42 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -3857,6 +3857,29 @@ void ref_transaction_free(struct ref_transaction *transaction)
> free(transaction);
> }
>
> +int is_per_worktree_ref(const char *refname)
> +{
> + return !strcmp(refname, "HEAD");
> +}
> +
> +static int is_pseudoref(const char *refname)
> +{
> + const char *c;
> +
> + if (strchr(refname, '/'))
> + return 0;
> +
> + if (is_per_worktree_ref(refname))
> + return 0;
> +
> + for (c = refname; *c; ++c) {
> + if (!isupper(*c) && *c != '-' && *c != '_')
> + return 0;
> + }
> +
> + return 1;
> +}
> +
> static struct ref_update *add_update(struct ref_transaction *transaction,
> const char *refname)
> {
> diff --git a/refs.h b/refs.h
> index e4e46c3..bd5526e 100644
> --- a/refs.h
> +++ b/refs.h
> @@ -445,6 +445,8 @@ extern int parse_hide_refs_config(const char *var, const char *value, const char
>
> extern int ref_is_hidden(const char *);
>
> +int is_per_worktree_ref(const char *refname);
> +
> enum expire_reflog_flags {
> EXPIRE_REFLOGS_DRY_RUN = 1 << 0,
> EXPIRE_REFLOGS_UPDATE_REF = 1 << 1,
next prev parent reply other threads:[~2015-07-24 19:20 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-24 4:45 [PATCH/RFC 0/9] Pseudorefs David Turner
2015-07-24 4:45 ` [PATCH 1/9] refs: Introduce pseudoref and per-worktree ref concepts David Turner
2015-07-24 7:34 ` Eric Sunshine
2015-07-24 19:20 ` Junio C Hamano [this message]
2015-07-24 20:13 ` David Turner
2015-07-24 20:44 ` Junio C Hamano
2015-07-24 19:52 ` Philip Oakley
2015-07-24 20:14 ` David Turner
2015-07-24 4:45 ` [PATCH 2/9] notes: replace pseudorefs with real refs David Turner
2015-07-24 4:45 ` [PATCH 3/9] bisect: do not use update-ref for BISECT_HEAD David Turner
2015-07-24 4:45 ` [PATCH 4/9] tests: treat FETCH_HEAD as a pseudoref David Turner
2015-07-24 4:45 ` [PATCH 5/9] tests: use --create-reflog option to git update-ref David Turner
2015-07-24 4:45 ` [PATCH 6/9] pseudorefs: create and use pseudoref update and delete functions David Turner
2015-07-24 19:25 ` Junio C Hamano
2015-07-24 20:17 ` David Turner
2015-07-24 20:53 ` Junio C Hamano
2015-07-24 4:45 ` [PATCH 7/9] am/rebase: update pseudorefs by writing files David Turner
2015-07-24 4:45 ` [PATCH 8/9] rebase: use write_pseudoref David Turner
2015-07-24 4:45 ` [PATCH 9/9] refs: forbid pseudoref updates through ref update API David Turner
2015-08-02 22:48 ` [PATCH/RFC 0/9] Pseudorefs Michael Haggerty
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=xmqqio99mkfp.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