git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v7 0/3] Cloning with remote unborn HEAD

From
JTJonathan Tan <jonathantanmy@google.com>
Date
Feb 5, 2021, 04:58 UTC
Message-ID
<cover.1612493309.git.jonathantanmy@google.com>
In-Reply-To
<20201208013121.677494-1-jonathantanmy@google.com>

For what it's worth, here's v7 with advertise/allow/ignore and by default, advertise. I think that some server operators will have use for this feature, and people who want to disable it for whatever reason can still do so. The main disadvantage is complexity - the server knob that server administrators will need to control (but between a simpler allow/ignore knob and a more complicated advertise/allow/ignore knob, I think we might as well go for the slightly more complex one) and complexity in the code (but now that is constrained to one function and a few global variables).

As you can see from the range-diff, not much has changed from v6.

I've also included Junio's suggestion of tightening the promise made by the server (when the client says "unborn").

Jonathan Tan (3):
  ls-refs: report unborn targets of symrefs
  connect, transport: encapsulate arg in struct
  clone: respect remote unborn HEAD
 Documentation/config.txt                |  2 +
 Documentation/config/init.txt           |  2 +-
 Documentation/config/lsrefs.txt         |  9 +++
 Documentation/technical/protocol-v2.txt | 11 +++-
 builtin/clone.c                         | 34 +++++++++---
 builtin/fetch-pack.c                    |  3 +-
 builtin/fetch.c                         | 18 +++---
 builtin/ls-remote.c                     |  9 +--
 connect.c                               | 32 ++++++++++-
 ls-refs.c                               | 74 ++++++++++++++++++++++++-
 ls-refs.h                               |  1 +
 remote.h                                |  4 +-
 serve.c                                 |  2 +-
 t/t5606-clone-options.sh                |  8 ++-
 t/t5701-git-serve.sh                    |  2 +-
 t/t5702-protocol-v2.sh                  | 25 +++++++++
 transport-helper.c                      |  5 +-
 transport-internal.h                    | 10 +---
 transport.c                             | 23 ++++----
 transport.h                             | 29 +++++++---
 20 files changed, 240 insertions(+), 63 deletions(-)
 create mode 100644 Documentation/config/lsrefs.txt
Range-diff against v6:
1:  411bbafe25 ! 1:  2d35075369 ls-refs: report unborn targets of symrefs
    @@ Commit message
         Currently, symrefs that have unborn targets (such as in this case) are
         not communicated by the protocol. Teach Git to advertise and support the
         "unborn" feature in "ls-refs" (by default, this is advertised, but
    -    server administrators may turn this off through the lsrefs.allowunborn
    +    server administrators may turn this off through the lsrefs.unborn
         config). This feature indicates that "ls-refs" supports the "unborn"
         argument; when it is specified, "ls-refs" will send the HEAD symref with
         the name of its unborn target.
    @@ Documentation/config.txt: include::config/interactive.txt[]
     
      ## Documentation/config/lsrefs.txt (new) ##
     @@
    -+lsrefs.allowUnborn::
    -+	Allow the server to send information about unborn symrefs during the
    -+	protocol v2 ref advertisement.
    ++lsrefs.unborn::
    ++	May be "advertise" (the default), "allow", or "ignore". If "advertise",
    ++	the server will respond to the client sending "unborn" (as described in
    ++	protocol-v2.txt) and will advertise support for this feature during the
    ++	protocol v2 capability advertisement. "allow" is the same as
    ++	"advertise" except that the server will not advertise support for this
    ++	feature; this is useful for load-balanced servers that cannot be
    ++	updated automatically (for example), since the administrator could
    ++	configure "allow", then after a delay, configure "advertise".
     
      ## Documentation/technical/protocol-v2.txt ##
     @@ Documentation/technical/protocol-v2.txt: ls-refs takes in the following arguments:
    @@ Documentation/technical/protocol-v2.txt: ls-refs takes in the following argument
     +included in the client's request.
     +
     +    unborn
    -+	The server may send symrefs pointing to unborn branches in the form
    -+	"unborn <refname> symref-target:<target>".
    ++	The server will send information about HEAD even if it is a symref
    ++	pointing to an unborn branch in the form "unborn HEAD
    ++	symref-target:<target>".
     +
      The output of ls-refs is as follows:
      
    @@ ls-refs.c
      #include "config.h"
      
     +static int config_read;
    ++static int advertise_unborn;
     +static int allow_unborn;
     +
     +static void ensure_config_read(void)
     +{
    ++	char *str = NULL;
    ++
     +	if (config_read)
     +		return;
     +
    -+	if (repo_config_get_bool(the_repository, "lsrefs.allowunborn",
    -+				 &allow_unborn))
    ++	if (repo_config_get_string(the_repository, "lsrefs.unborn", &str)) {
     +		/*
    -+		 * If there is no such config, set it to 1 to allow it by
    ++		 * If there is no such config, advertise and allow it by
     +		 * default.
     +		 */
    ++		advertise_unborn = 1;
     +		allow_unborn = 1;
    ++	} else {
    ++		if (!strcmp(str, "advertise")) {
    ++			advertise_unborn = 1;
    ++			allow_unborn = 1;
    ++		} else if (!strcmp(str, "allow")) {
    ++			allow_unborn = 1;
    ++		} else if (!strcmp(str, "ignore")) {
    ++			/* do nothing */
    ++		} else {
    ++			die(_("invalid value '%s' for lsrefs.unborn"), str);
    ++		}
    ++	}
     +	config_read = 1;
     +}
     +
    @@ ls-refs.c: int ls_refs(struct repository *r, struct strvec *keys,
     +{
     +	if (value) {
     +		ensure_config_read();
    -+		if (allow_unborn)
    ++		if (advertise_unborn)
     +			strbuf_addstr(value, "unborn");
     +	}
     +
2:  fad1ebe6b6 = 2:  d4ed13d02e connect, transport: encapsulate arg in struct
3:  45a48ccc0d ! 3:  a3e5a0a7c5 clone: respect remote unborn HEAD
    @@ t/t5606-clone-options.sh: test_expect_success 'redirected clone -v does show pro
     -	git init --bare empty &&
     +	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
     +	git -c init.defaultBranch=foo init --bare empty &&
    -+	test_config -C empty lsrefs.allowUnborn true &&
    ++	test_config -C empty lsrefs.unborn advertise &&
      	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
      	git -c init.defaultBranch=up clone empty whats-up &&
     -	test refs/heads/up = $(git -C whats-up symbolic-ref HEAD) &&
    @@ t/t5702-protocol-v2.sh: test_expect_success 'clone with file:// using protocol v
     +
     +	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
     +	git -c init.defaultBranch=mydefaultbranch init file_empty_parent &&
    -+	test_config -C file_empty_parent lsrefs.allowUnborn false &&
    ++	test_config -C file_empty_parent lsrefs.unborn ignore &&
     +
     +	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
     +	git -c init.defaultBranch=main -c protocol.version=2 \
-- 
2.30.0.365.g02bc693789-goog
Previous: Jonathan TanNext: Jonathan Tan
Message 95 of 109 in “Cloning empty repository uses locally configured default branch name”
  1. Jonathan TanDec 8, 2020
  2. Junio C HamanoDec 8, 2020
  3. brian m. carlsonDec 8, 2020
  4. Jonathan TanDec 8, 2020
  5. Junio C HamanoDec 8, 2020
  6. Jeff KingDec 8, 2020
  7. Jonathan TanDec 8, 2020
  8. Jeff KingDec 8, 2020
  9. clone: in protocol v2, use remote's default branchJonathan Tan, Dec 11, 2020
  10. Junio C HamanoDec 11, 2020
  11. Ævar Arnfjörð BjarmasonDec 14, 2020
  12. Felipe ContrerasDec 14, 2020
  13. Junio C HamanoDec 14, 2020
  14. Ævar Arnfjörð BjarmasonDec 15, 2020
  15. Junio C HamanoDec 15, 2020
  16. Jeff KingDec 15, 2020
  17. Junio C HamanoDec 15, 2020
  18. Jeff KingDec 15, 2020
  19. Junio C HamanoDec 16, 2020
  20. Jeff KingDec 16, 2020
  21. Junio C HamanoDec 16, 2020
  22. Jeff KingDec 18, 2020
  23. Felipe ContrerasDec 15, 2020
  24. Jonathan TanDec 14, 2020
  25. Felipe ContrerasDec 14, 2020
  26. Jeff KingDec 15, 2020
  27. Jonathan TanDec 15, 2020
  28. 0/3 Cloning with remote unborn HEADJonathan Tan, Dec 16, 2020
  29. 1/3 ls-refs: report unborn targets of symrefsJonathan Tan, Dec 16, 2020
  30. Junio C HamanoDec 16, 2020
  31. Jonathan TanDec 16, 2020
  32. Jeff KingDec 16, 2020
  33. Jonathan TanDec 16, 2020
  34. Junio C HamanoDec 17, 2020
  35. Jeff KingDec 18, 2020
  36. 2/3 connect, transport: add no-op arg for future patchJonathan Tan, Dec 16, 2020
  37. Junio C HamanoDec 16, 2020
  38. 3/3 clone: respect remote unborn HEADJonathan Tan, Dec 16, 2020
  39. 0/3 Cloning with remote unborn HEADJonathan Tan, Dec 21, 2020
  40. 1/3 ls-refs: report unborn targets of symrefsJonathan Tan, Dec 21, 2020
  41. 2/3 connect, transport: add no-op arg for future patchJonathan Tan, Dec 21, 2020
  42. 3/3 clone: respect remote unborn HEADJonathan Tan, Dec 21, 2020
  43. Junio C HamanoDec 21, 2020
  44. Jeff KingJan 21, 2021
  45. 0/3 Cloning with remote unborn HEADJonathan Tan, Dec 22, 2020
  46. 1/3 ls-refs: report unborn targets of symrefsJonathan Tan, Dec 22, 2020
  47. Jeff KingJan 21, 2021
  48. Jonathan TanJan 26, 2021
  49. Jeff KingJan 26, 2021
  50. 2/3 connect, transport: add no-op arg for future patchJonathan Tan, Dec 22, 2020
  51. Jeff KingJan 21, 2021
  52. Jonathan TanJan 26, 2021
  53. 3/3 clone: respect remote unborn HEADJonathan Tan, Dec 22, 2020
  54. Jeff KingJan 21, 2021
  55. Jonathan TanJan 26, 2021
  56. Jeff KingJan 26, 2021
  57. Junio C HamanoJan 28, 2021
  58. Junio C HamanoDec 22, 2020
  59. 0/3 Cloning with remote unborn HEADJonathan Tan, Jan 26, 2021
  60. 1/3 ls-refs: report unborn targets of symrefsJonathan Tan, Jan 26, 2021
  61. Junio C HamanoJan 26, 2021
  62. Jeff KingJan 26, 2021
  63. Junio C HamanoJan 26, 2021
  64. Junio C HamanoJan 26, 2021
  65. Jonathan TanJan 30, 2021
  66. Jonathan TanJan 29, 2021
  67. Junio C HamanoJan 29, 2021
  68. Jonathan TanFeb 2, 2021
  69. Junio C HamanoFeb 2, 2021
  70. Ævar Arnfjörð BjarmasonJan 27, 2021
  71. Jonathan TanJan 30, 2021
  72. 2/3 connect, transport: encapsulate arg in structJonathan Tan, Jan 26, 2021
  73. Junio C HamanoJan 26, 2021
  74. Jonathan TanJan 30, 2021
  75. 3/3 clone: respect remote unborn HEADJonathan Tan, Jan 26, 2021
  76. Junio C HamanoJan 26, 2021
  77. Jonathan TanJan 30, 2021
  78. Ævar Arnfjörð BjarmasonJan 27, 2021
  79. Jonathan TanJan 30, 2021
  80. Ævar Arnfjörð BjarmasonJan 30, 2021
  81. Jonathan TanFeb 2, 2021
  82. Ævar Arnfjörð BjarmasonFeb 3, 2021
  83. Junio C HamanoFeb 5, 2021
  84. Junio C HamanoJan 27, 2021
  85. Jeff KingJan 27, 2021
  86. Junio C HamanoJan 27, 2021
  87. 0/3 Cloning with remote unborn HEADJonathan Tan, Feb 2, 2021
  88. 1/3 ls-refs: report unborn targets of symrefsJonathan Tan, Feb 2, 2021
  89. Junio C HamanoFeb 2, 2021
  90. Jonathan TanFeb 2, 2021
  91. Junio C HamanoFeb 2, 2021
  92. Jonathan TanFeb 3, 2021
  93. 2/3 connect, transport: encapsulate arg in structJonathan Tan, Feb 2, 2021
  94. 3/3 clone: respect remote unborn HEADJonathan Tan, Feb 2, 2021
  95. 0/3 Cloning with remote unborn HEADJonathan Tan, Feb 5, 2021
  96. 1/3 ls-refs: report unborn targets of symrefsJonathan Tan, Feb 5, 2021
  97. Jeff KingFeb 5, 2021
  98. 2/3 connect, transport: encapsulate arg in structJonathan Tan, Feb 5, 2021
  99. 3/3 clone: respect remote unborn HEADJonathan Tan, Feb 5, 2021
  100. Junio C HamanoFeb 5, 2021
  101. Ævar Arnfjörð BjarmasonFeb 5, 2021
  102. Junio C HamanoFeb 5, 2021
  103. Jeff KingFeb 5, 2021
  104. 0/3 Cloning with remote unborn HEADJonathan Tan, Feb 5, 2021
  105. 3/3 clone: respect remote unborn HEADJonathan Tan, Feb 5, 2021
  106. 2/3 connect, transport: encapsulate arg in structJonathan Tan, Feb 5, 2021
  107. 1/3 ls-refs: report unborn targets of symrefsJonathan Tan, Feb 5, 2021
  108. Junio C HamanoFeb 6, 2021
  109. Junio C HamanoFeb 8, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.