From: Taylor Blau <me@ttaylorr.com>
To: git@vger.kernel.org
Cc: peff@peff.net, gitster@pobox.com, sunshine@sunshineco.com,
sbeller@google.com
Subject: [PATCH v2 0/3] Filter alternate references
Date: Fri, 21 Sep 2018 14:47:36 -0400 [thread overview]
Message-ID: <cover.1537555544.git.me@ttaylorr.com> (raw)
In-Reply-To: <cover.1537466087.git.me@ttaylorr.com>
Hi,
Attached is the second re-roll of my series to teach
"core.alternateRefsCommand" and "core.alternateRefsPrefixes".
I have included a range-diff below (which I have taught my scripts to do
by default now), but will summarize the changes as usual:
* Clean up t5410 according to Peff's suggestions in [1]:
* Simplify many `git update-ref -d`'s into one `git update-ref
--stdin`.
* Use `echo >`, instead of `printf >` to write an alternate
repository.
* Avoid placing Git on the left-hand side of a pipe.
* Use 'write_script', instead of embedding the same code in a
lengthy 'test_config'.
* Add a motivating example in Documentation/config.txt, per Peff's
suggestion in [1].
* Use `printf "%s .have\n"` with many arguments instead of another
`cat <<-EOF` block and extract it into `expect_haves`, per [2].
* Do not use `grep -o` in `extract_haves`, thus making it portable.
Per [3].
[1]: https://public-inbox.org/git/20180920193751.GC29603@sigill.intra.peff.net/
[2]: https://public-inbox.org/git/CAPig+cT7WTyBCQZ75WSjmBqiui383YrKqoHqbLASQkOaGVTfVA@mail.gmail.com/
[3]: https://public-inbox.org/git/xmqqlg7ux0st.fsf@gitster-ct.c.googlers.com/
Taylor Blau (3):
transport.c: extract 'fill_alternate_refs_command'
transport.c: introduce core.alternateRefsCommand
transport.c: introduce core.alternateRefsPrefixes
Documentation/config.txt | 18 ++++++++++++
t/t5410-receive-pack.sh | 62 ++++++++++++++++++++++++++++++++++++++++
transport.c | 34 ++++++++++++++++++----
3 files changed, 108 insertions(+), 6 deletions(-)
create mode 100755 t/t5410-receive-pack.sh
Range-diff against v1:
1: 6e3a58afe7 = 1: 6e3a58afe7 transport.c: extract 'fill_alternate_refs_command'
2: 4c4900722c ! 2: 9797f52551 transport.c: introduce core.alternateRefsCommand
@@ -42,6 +42,11 @@
+ the shell to execute the specified command instead of
+ linkgit:git-for-each-ref[1]. The first argument is the path of the alternate.
+ Output must be of the form: `%(objectname) SPC %(refname)`.
+++
++This is useful when a repository only wishes to advertise some of its
++alternate's references as ".have"'s. For example, to only advertise branch
++heads, configure `core.alternateRefsCommand` to the path of a script which runs
++`git --git-dir="$1" for-each-ref refs/heads`.
+
core.bare::
If true this repository is assumed to be 'bare' and has no
@@ -70,32 +75,39 @@
+ (
+ cd fork &&
+ git config receive.advertisealternates true &&
-+ git update-ref -d refs/heads/a &&
-+ git update-ref -d refs/heads/b &&
-+ git update-ref -d refs/heads/c &&
-+ git update-ref -d refs/heads/master &&
-+ git update-ref -d refs/tags/one &&
-+ git update-ref -d refs/tags/two &&
-+ git update-ref -d refs/tags/three &&
-+ printf "../../.git/objects" >objects/info/alternates
++ cat <<-EOF | git update-ref --stdin &&
++ delete refs/heads/a
++ delete refs/heads/b
++ delete refs/heads/c
++ delete refs/heads/master
++ delete refs/tags/one
++ delete refs/tags/two
++ delete refs/tags/three
++ EOF
++ echo "../../.git/objects" >objects/info/alternates
+ )
+'
+
++expect_haves () {
++ printf "%s .have\n" $(git rev-parse $@) >expect
++}
++
+extract_haves () {
-+ depacketize - | grep -o '^.* \.have'
++ depacketize - | grep '\.have' | sed -e 's/\\0.*$//g'
+}
+
+test_expect_success 'with core.alternateRefsCommand' '
-+ test_config -C fork core.alternateRefsCommand \
-+ "git --git-dir=\"\$1\" for-each-ref \
-+ --format=\"%(objectname) %(refname)\" \
-+ refs/heads/a refs/heads/c;:" &&
-+ cat >expect <<-EOF &&
-+ $(git rev-parse a) .have
-+ $(git rev-parse c) .have
++ write_script fork/alternate-refs <<-\EOF &&
++ git --git-dir="$1" for-each-ref \
++ --format="%(objectname) %(refname)" \
++ refs/heads/a \
++ refs/heads/c
+ EOF
-+ printf "0000" | git receive-pack fork | extract_haves >actual &&
-+ test_cmp expect actual
++ test_config -C fork core.alternateRefsCommand alternate-refs &&
++ expect_haves a c >expect &&
++ printf "0000" | git receive-pack fork >actual &&
++ extract_haves <actual >actual.haves &&
++ test_cmp expect actual.haves
+'
+
+test_done
3: 3639e90588 ! 3: 6e8f65a16d transport.c: introduce core.alternateRefsPrefixes
@@ -40,13 +40,14 @@
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@
- linkgit:git-for-each-ref[1]. The first argument is the path of the alternate.
- Output must be of the form: `%(objectname) SPC %(refname)`.
+ heads, configure `core.alternateRefsCommand` to the path of a script which runs
+ `git --git-dir="$1" for-each-ref refs/heads`.
+core.alternateRefsPrefixes::
+ When listing references from an alternate, list only references that begin
-+ with the given prefix. To list multiple prefixes, separate them with a
-+ whitespace character. If `core.alternateRefsCommand` is set, setting
++ with the given prefix. Prefixes match as if they were given as arguments to
++ linkgit:git-for-each-ref[1]. To list multiple prefixes, separate them with
++ whitespace. If `core.alternateRefsCommand` is set, setting
+ `core.alternateRefsPrefixes` has no effect.
+
core.bare::
@@ -57,18 +58,15 @@
--- a/t/t5410-receive-pack.sh
+++ b/t/t5410-receive-pack.sh
@@
- test_cmp expect actual
+ test_cmp expect actual.haves
'
+test_expect_success 'with core.alternateRefsPrefixes' '
+ test_config -C fork core.alternateRefsPrefixes "refs/tags" &&
-+ cat >expect <<-EOF &&
-+ $(git rev-parse one) .have
-+ $(git rev-parse three) .have
-+ $(git rev-parse two) .have
-+ EOF
-+ printf "0000" | git receive-pack fork | extract_haves >actual &&
-+ test_cmp expect actual
++ expect_haves one three two >expect &&
++ printf "0000" | git receive-pack fork >actual &&
++ extract_haves <actual >actual.haves &&
++ test_cmp expect actual.haves
+'
+
test_done
--
2.19.0.221.g150f307af
next prev parent reply other threads:[~2018-09-21 18:47 UTC|newest]
Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-20 18:04 [PATCH 0/3] Filter alternate references Taylor Blau
2018-09-20 18:04 ` [PATCH 1/3] transport.c: extract 'fill_alternate_refs_command' Taylor Blau
2018-09-20 18:04 ` [PATCH 2/3] transport.c: introduce core.alternateRefsCommand Taylor Blau
2018-09-20 19:37 ` Jeff King
2018-09-20 20:00 ` Taylor Blau
2018-09-20 20:06 ` Jeff King
2018-09-21 16:39 ` Junio C Hamano
2018-09-21 17:48 ` Taylor Blau
2018-09-21 17:57 ` Taylor Blau
2018-09-21 19:59 ` Junio C Hamano
2018-09-26 0:56 ` Taylor Blau
2018-09-20 18:04 ` [PATCH 3/3] transport.c: introduce core.alternateRefsPrefixes Taylor Blau
2018-09-20 19:47 ` Jeff King
2018-09-20 20:12 ` Taylor Blau
2018-09-21 7:19 ` Eric Sunshine
2018-09-21 14:07 ` Taylor Blau
2018-09-21 16:45 ` Junio C Hamano
2018-09-21 17:49 ` Taylor Blau
2018-09-21 16:40 ` Junio C Hamano
2018-09-20 18:35 ` [PATCH 0/3] Filter alternate references Stefan Beller
2018-09-20 18:56 ` Taylor Blau
2018-09-20 19:27 ` Jeff King
2018-09-20 19:21 ` Jeff King
2018-09-21 18:47 ` Taylor Blau [this message]
2018-09-21 18:47 ` [PATCH v2 1/3] transport.c: extract 'fill_alternate_refs_command' Taylor Blau
2018-09-21 18:47 ` [PATCH v2 2/3] transport.c: introduce core.alternateRefsCommand Taylor Blau
2018-09-21 20:18 ` Eric Sunshine
2018-09-26 0:59 ` Taylor Blau
2018-09-21 21:09 ` Junio C Hamano
2018-09-21 22:13 ` Jeff King
2018-09-21 22:23 ` Junio C Hamano
2018-09-21 22:27 ` Jeff King
2018-09-26 1:06 ` Taylor Blau
2018-09-26 3:21 ` Jeff King
2018-09-21 21:10 ` Eric Sunshine
2018-09-22 18:02 ` brian m. carlson
2018-09-22 19:52 ` Jeff King
2018-09-23 14:53 ` brian m. carlson
2018-09-26 1:09 ` Taylor Blau
2018-09-26 3:33 ` Jeff King
2018-09-26 13:39 ` Taylor Blau
2018-09-26 18:38 ` Jeff King
2018-09-28 2:39 ` Taylor Blau
2018-09-21 18:47 ` [PATCH v2 3/3] transport.c: introduce core.alternateRefsPrefixes Taylor Blau
2018-09-21 21:14 ` Junio C Hamano
2018-09-21 21:37 ` Jeff King
2018-09-21 22:06 ` Junio C Hamano
2018-09-21 22:18 ` Jeff King
2018-09-21 22:23 ` Stefan Beller
2018-09-24 15:17 ` Junio C Hamano
2018-09-24 18:10 ` Jeff King
2018-09-24 20:32 ` Junio C Hamano
2018-09-24 20:50 ` Jeff King
2018-09-24 21:01 ` Jeff King
2018-09-24 21:55 ` Junio C Hamano
2018-09-24 23:14 ` Jeff King
2018-09-25 17:41 ` Junio C Hamano
2018-09-25 22:46 ` Taylor Blau
2018-09-25 23:56 ` Junio C Hamano
2018-09-26 1:18 ` Taylor Blau
2018-09-26 3:16 ` Jeff King
2018-09-28 4:25 ` [PATCH v3 0/4] Filter alternate references Taylor Blau
2018-09-28 4:25 ` [PATCH v3 1/4] transport: drop refnames from for_each_alternate_ref Jeff King
2018-09-28 4:58 ` Jeff King
2018-09-28 14:21 ` Taylor Blau
2018-09-28 4:25 ` [PATCH v3 2/4] transport.c: extract 'fill_alternate_refs_command' Taylor Blau
2018-09-28 4:59 ` Jeff King
2018-09-28 4:25 ` [PATCH v3 3/4] transport.c: introduce core.alternateRefsCommand Taylor Blau
2018-09-28 5:26 ` Jeff King
2018-09-28 22:04 ` Taylor Blau
2018-09-29 7:31 ` Jeff King
2018-10-02 1:56 ` Taylor Blau
2018-09-28 4:25 ` [PATCH v3 4/4] transport.c: introduce core.alternateRefsPrefixes Taylor Blau
2018-09-28 5:30 ` Jeff King
2018-09-28 22:05 ` Taylor Blau
2018-09-29 7:34 ` Jeff King
2018-10-02 1:57 ` Taylor Blau
2018-10-02 2:00 ` Taylor Blau
2018-10-02 2:23 ` [PATCH v4 0/4] Filter alternate references Taylor Blau
2018-10-02 2:23 ` [PATCH v4 1/4] transport: drop refnames from for_each_alternate_ref Taylor Blau
2018-10-02 2:23 ` [PATCH v4 2/4] transport.c: extract 'fill_alternate_refs_command' Taylor Blau
2018-10-02 2:23 ` [PATCH v4 3/4] transport.c: introduce core.alternateRefsCommand Taylor Blau
2018-10-02 23:40 ` Jeff King
2018-10-04 2:17 ` Taylor Blau
2018-10-02 2:24 ` [PATCH v4 4/4] transport.c: introduce core.alternateRefsPrefixes Taylor Blau
2018-10-02 15:13 ` Ramsay Jones
2018-10-02 23:28 ` Taylor Blau
2018-10-08 18:09 ` [PATCH v5 0/4] Filter alternate references Taylor Blau
2018-10-08 18:09 ` [PATCH v5 1/4] transport: drop refnames from for_each_alternate_ref Taylor Blau
2018-10-08 18:09 ` [PATCH v5 2/4] transport.c: extract 'fill_alternate_refs_command' Taylor Blau
2018-10-08 18:09 ` [PATCH v5 3/4] transport.c: introduce core.alternateRefsCommand Taylor Blau
2018-10-08 18:09 ` [PATCH v5 4/4] transport.c: introduce core.alternateRefsPrefixes Taylor Blau
2018-10-09 3:09 ` [PATCH v5 0/4] Filter alternate references Jeff King
2018-10-09 14:49 ` Taylor Blau
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=cover.1537555544.git.me@ttaylorr.com \
--to=me@ttaylorr.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=sbeller@google.com \
--cc=sunshine@sunshineco.com \
/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).