Skip to contentSkip to conversation

What's cooking draft as of 2024-09-06 late night

DISCUSSION Junio C Hamano 3 participants 9 messages Sep 7, 2024 – Sep 10, 2024 Documentation

lore
Share & tools
lore
#0 lore raw

This is not the full list of topics in master..seen but just a selected subset. I am hoping that the topics marked for 'next' are already ready but if I missed some objections, please let me know.

Thanks.

Needs review.
- tb/incremental-midx-part-2 08-28 #16
<[email protected]>
- ps/environ-wo-the-repository 08-30 #21
<[email protected]>
- jc/pass-repo-to-builtins 09-05 #4
<[email protected]>
- ja/doc-synopsis-markup 09-05 #3
<[email protected]>

Will merge to 'master'.

 + jk/free-commit-buffer-of-skipped-commits                     08-30/09-03    #1
 + ah/mergetols-vscode                                          09-01/09-04    #1
 + rj/compat-terminal-unused-fix                                09-01/09-04    #1
 + ps/declare-pack-redundamt-dead                               09-03/09-04    #1
 + jc/mailinfo-header-cleanup                                   08-20/09-05    #1
 + gt/unit-test-oid-array                                       09-01/09-05    #1
 + ps/index-pack-outside-repo-fix                               09-04/09-05    #1
 + ps/clar-unit-test                                            09-04/09-05   #14
 + tb/multi-pack-reuse-fix                                      08-27/09-06    #5
 + kl/cat-file-on-sparse-index                                  09-04/09-06    #2
 + ps/pack-refs-auto-heuristics                                 09-04/09-06    #3
 + jk/messages-with-excess-lf-fix                               09-05/09-06    #1

Will merge to 'next'.

 - ds/doc-wholesale-disabling-advice-messages                   09-06          #1
 - jk/sparse-fdleak-fix                                         09-06          #3
 - sp/mailmap                                                   09-06          #1
 - ds/scalar-no-tags                                            09-06          #1

Will merge to 'next'?
- pw/rebase-autostash-fix 09-03 #1
<[email protected]>
- sk/enable-prefetch-per-remote 09-05 #1
<[email protected]>
- ps/leakfixes-part-6 09-05 #22
<[email protected]>
- bl/trailers-and-incomplete-last-line-fix 09-06 #1
<[email protected]>
- tb/weak-sha1-for-tail-sum 09-06 #9
<[email protected]>

#1 lore raw

Hi Junio and Shubham

Quoted 3 lines · Junio C Hamano

Will merge to 'next'?
- sk/enable-prefetch-per-remote 09-05 #1

    <[email protected]>

I've just taken a look at this and I'm left wondering why one would want to skip prefetching from a remote but still fetch from it with "git fetch --all". I set remote.<remote>.skipFetchAll for the remotes I don't want to prefetch. We also have remote.<remote>.skipDefaultUpdate I don't know offhand if that prevents a remote from being prefetched as well. I think being able to specify which refs are prefectched would be useful. Overloading remote.<remote>.prefetch to be a boolean or a refspec would complicate the implementation so maybe we'd be better just supporting refspecs and update the maintenance documentation to point users to the existing config for skipping prefetches.

Best Wishes

Phillip

#2 lore raw

Re*: What's cooking draft as of 2024-09-06 late night

Quoted 11 lines · Phillip Wood

Hi Junio and Shubham

Quoted 3 lines · Junio C Hamano

Will merge to 'next'?
- sk/enable-prefetch-per-remote 09-05 #1

    <[email protected]>

I've just taken a look at this and I'm left wondering why one would want to skip prefetching from a remote but still fetch from it with "git fetch --all". I set remote.<remote>.skipFetchAll for the remotes I don't want to prefetch.

It is nice to see a review from somebody who fetches from multiple remotes in real life. Very much appreciated. I have a few repositories to pull from, but I never do "fetch --all", so skipFetchAll was totally outside my awareness.

Quoted 2 lines

We also have remote.<remote>.skipDefaultUpdate I don't know offhand if that prevents a remote from being prefetched as well.

Yuck. And this one is described with an identical text as the previous one. What is going on?

    ... goes and looks ...

Ah, yes, they internally update the same .skip_default_update member in the struct remote; the only bug is that the documentation does not make it clear that they are synonyms to each other.

What is curious is that 7cc91a2f (Add the configuration option skipFetchAll, 2009-11-09) added for the sole purpose of adding this one, without explaining anything about the reason why it was needed, and my quick browsing did not find any discussion on the topic in the era.

In any case, a remote that has .skip_default_update member set indeed is exempt from prefetch since 32f67888 (maintenance: respect remote.*.skipFetchAll, 2021-04-16), so it is a viable alternative (assuming that nobody would want to omit prefetching from a remote even if they want to fetch from the remote with "fetch --all" or "remote update", which is a sensible assumption) to just document this existing behaviour to help the users.

Quoted 2 lines

I think being able to specify which refs are prefectched would be useful.

Yes, that is what we said it is OK to punt in the first step, which is fine to be done in the follow-up step.

--- >8 ---
Subject: doc: remote.*.skip{DefaultUpdate,FetchAll} stops prefetch

Back when 7cc91a2f (Add the configuration option skipFetchAll, 2009-11-09) added for the sole purpose of adding skipFetchAll as a synonym to skipDefaultUpdate, there was no explanation about the reason why it was needed., but these two configuration variables mean exactly the same thing.

Also, when we taught the "prefetch" task to "git maintenance" later, we did make it pay attention to the setting, but we forgot to document it.

Document these variables as synonyms that collectively implements the last-one-wins semantics, and also clarify that the prefetch task is also controlled by this variable.

---
* Note that "skipped by default" in the original has been rewritten to "skipped" (unconditional), and this is deliberate. When there is no conditionality and the behaviour is the only available one, it is *not* "by default".

 Documentation/config/remote.txt   | 13 +++++++------
 Documentation/git-maintenance.txt |  3 +++
 2 files changed, 10 insertions(+), 6 deletions(-)
Documentation/config/remote.txt +7 -6
index 8efc53e836..36e771556c 100644
@@ -42,14 +42,15 @@ remote.<name>.mirror::
 	as if the `--mirror` option was given on the command line.
 
 remote.<name>.skipDefaultUpdate::
-	If true, this remote will be skipped by default when updating
-	using linkgit:git-fetch[1] or the `update` subcommand of
-	linkgit:git-remote[1].
+	A deprecated synonym to `remote.<name>.skipFetchAll` (if
+	both are set in the configuration files with different
+	values, the value of the last occurrence will be used).
 
 remote.<name>.skipFetchAll::
-	If true, this remote will be skipped by default when updating
-	using linkgit:git-fetch[1] or the `update` subcommand of
-	linkgit:git-remote[1].
+	If true, this remote will be skipped when updating
+	using linkgit:git-fetch[1], the `update` subcommand of
+	linkgit:git-remote[1], and ignored by the prefetch task
+	of `git maitenance`.
 
 remote.<name>.receivepack::
 	The default program to execute on the remote side when pushing.  See
Documentation/git-maintenance.txt +3 -0
index 51d0f7e94b..9d96819133 100644
@@ -107,6 +107,9 @@ with the prefetch task, the objects necessary to complete a later real fetch
 would already be obtained, making the real fetch faster.  In the ideal case,
 it will just become an update to a bunch of remote-tracking branches without
 any object transfer.
++
+The `remote.<name>.skipFetchAll` configuration can be used to
+exclude a particular remote from getting prefetched.
 
 gc::
 	Clean up unnecessary files and optimize the local repository. "GC"
#3 lore raw

Re: Re*: What's cooking draft as of 2024-09-06 late night

Quoted 111 lines · Junio C Hamano
Quoted 11 lines · Phillip Wood

Hi Junio and Shubham

Quoted 3 lines · Junio C Hamano

Will merge to 'next'?
- sk/enable-prefetch-per-remote 09-05 #1

    <[email protected]>

I've just taken a look at this and I'm left wondering why one would want to skip prefetching from a remote but still fetch from it with "git fetch --all". I set remote.<remote>.skipFetchAll for the remotes I don't want to prefetch.

It is nice to see a review from somebody who fetches from multiple remotes in real life. Very much appreciated. I have a few repositories to pull from, but I never do "fetch --all", so skipFetchAll was totally outside my awareness.

Quoted 2 lines

We also have remote.<remote>.skipDefaultUpdate I don't know offhand if that prevents a remote from being prefetched as well.

Yuck. And this one is described with an identical text as the previous one. What is going on?

    ... goes and looks ...

Ah, yes, they internally update the same .skip_default_update member in the struct remote; the only bug is that the documentation does not make it clear that they are synonyms to each other.

What is curious is that 7cc91a2f (Add the configuration option skipFetchAll, 2009-11-09) added for the sole purpose of adding this one, without explaining anything about the reason why it was needed, and my quick browsing did not find any discussion on the topic in the era.

In any case, a remote that has .skip_default_update member set indeed is exempt from prefetch since 32f67888 (maintenance: respect remote.*.skipFetchAll, 2021-04-16), so it is a viable alternative (assuming that nobody would want to omit prefetching from a remote even if they want to fetch from the remote with "fetch --all" or "remote update", which is a sensible assumption) to just document this existing behaviour to help the users.

Quoted 2 lines

I think being able to specify which refs are prefectched would be useful.

Yes, that is what we said it is OK to punt in the first step, which is fine to be done in the follow-up step.

--- >8 ---
Subject: doc: remote.*.skip{DefaultUpdate,FetchAll} stops prefetch

Back when 7cc91a2f (Add the configuration option skipFetchAll, 2009-11-09) added for the sole purpose of adding skipFetchAll as a synonym to skipDefaultUpdate, there was no explanation about the reason why it was needed., but these two configuration variables mean exactly the same thing.

Also, when we taught the "prefetch" task to "git maintenance" later, we did make it pay attention to the setting, but we forgot to document it.

Document these variables as synonyms that collectively implements the last-one-wins semantics, and also clarify that the prefetch task is also controlled by this variable.

---
* Note that "skipped by default" in the original has been rewritten to "skipped" (unconditional), and this is deliberate. When there is no conditionality and the behaviour is the only available one, it is *not* "by default".

 Documentation/config/remote.txt   | 13 +++++++------
 Documentation/git-maintenance.txt |  3 +++
 2 files changed, 10 insertions(+), 6 deletions(-)
Documentation/config/remote.txt +7 -6
index 8efc53e836..36e771556c 100644
@@ -42,14 +42,15 @@ remote.<name>.mirror::
        as if the `--mirror` option was given on the command line.
 
 remote.<name>.skipDefaultUpdate::
-       If true, this remote will be skipped by default when updating
-       using linkgit:git-fetch[1] or the `update` subcommand of
-       linkgit:git-remote[1].
+       A deprecated synonym to `remote.<name>.skipFetchAll` (if
+       both are set in the configuration files with different
+       values, the value of the last occurrence will be used).
 
 remote.<name>.skipFetchAll::
-       If true, this remote will be skipped by default when updating
-       using linkgit:git-fetch[1] or the `update` subcommand of
-       linkgit:git-remote[1].
+       If true, this remote will be skipped when updating
+       using linkgit:git-fetch[1], the `update` subcommand of
+       linkgit:git-remote[1], and ignored by the prefetch task
+       of `git maitenance`.
 
 remote.<name>.receivepack::
        The default program to execute on the remote side when pushing.  See
Documentation/git-maintenance.txt +0 -0
index 51d0f7e94b..9d96819133 100644

Documentation/git-maintenance.txt with the prefetch task, the objects necessary to complete a later real fetch · line 115

Quoted 9 lines
Documentation/git-maintenance.txt +3 -0
@@ -107,6 +107,9 @@ with the prefetch task, the objects necessary to complete a later real fetch
 would already be obtained, making the real fetch faster.  In the ideal case,
 it will just become an update to a bunch of remote-tracking branches without
 any object transfer.
++
+The `remote.<name>.skipFetchAll` configuration can be used to
+exclude a particular remote from getting prefetched.
 
 gc::
        Clean up unnecessary files and optimize the local repository. "GC"

I agree — there are rarely reasons to keep a different fetch behavior for prefetch vs. fetch all, and skipFetchAll should
do the trick for most use cases. My original goal was to restrict refs anyway, I don't work with multiple remotes either.

I'd have perhaps expected these properties to be documented (or at least referenced) in the documentation for git-fetch.
The only place skipFetchAll is currently documented is in this large master list of configs that are easy to miss —
https://git-scm.com/docs/git-config.

If there's a consensus, I'll switch to submitting a patch for prefetchref instead.

`

#4 lore raw

Re: Re*: What's cooking draft as of 2024-09-06 late night

Hi Shubham

Quoted 11 lines · Shubham Kanodia

I agree — there are rarely reasons to keep a different fetch behavior for prefetch vs. fetch all, and skipFetchAll should
do the trick for most use cases. My original goal was to restrict refs anyway, I don't work with multiple remotes either.

I'd have perhaps expected these properties to be documented (or at least referenced) in the documentation for git-fetch.
The only place skipFetchAll is currently documented is in this large master list of configs that are easy to miss —
https://git-scm.com/docs/git-config.

We could perhaps expand the documentation of git fetch --all to mention skipFetchAll

Quoted 2 lines

If there's a consensus, I'll switch to submitting a patch for prefetchref instead.

I think that would be a useful addition. Given the names of the existing refspec variables end '.fetch' and '.push' I'd be tempted to call it 'remote.<remote>.prefetch'.

Best Wishes

Phillip

#8 lore raw

Re: Re*: What's cooking draft as of 2024-09-06 late night

In reply to Junio C Hamano

Hi Junio

Quoted 17 lines · Junio C Hamano

--- >8 ---
Subject: doc: remote.*.skip{DefaultUpdate,FetchAll} stops prefetch

Back when 7cc91a2f (Add the configuration option skipFetchAll, 2009-11-09) added for the sole purpose of adding skipFetchAll as a synonym to skipDefaultUpdate, there was no explanation about the reason why it was needed., but these two configuration variables mean exactly the same thing.

Also, when we taught the "prefetch" task to "git maintenance" later, we did make it pay attention to the setting, but we forgot to document it.

Document these variables as synonyms that collectively implements the last-one-wins semantics, and also clarify that the prefetch task is also controlled by this variable.

Quoted 6 lines

---
* Note that "skipped by default" in the original has been rewritten to "skipped" (unconditional), and this is deliberate. When there is no conditionality and the behaviour is the only available one, it is *not* "by default".

This all sounds sensible, the patch looks good to me

Best Wishes

Phillip

Quoted 45 lines
  Documentation/config/remote.txt   | 13 +++++++------
  Documentation/git-maintenance.txt |  3 +++
  2 files changed, 10 insertions(+), 6 deletions(-)
Documentation/config/remote.txt +7 -6
index 8efc53e836..36e771556c 100644
@@ -42,14 +42,15 @@ remote.<name>.mirror::
  	as if the `--mirror` option was given on the command line.
 
  remote.<name>.skipDefaultUpdate::
-	If true, this remote will be skipped by default when updating
-	using linkgit:git-fetch[1] or the `update` subcommand of
-	linkgit:git-remote[1].
+	A deprecated synonym to `remote.<name>.skipFetchAll` (if
+	both are set in the configuration files with different
+	values, the value of the last occurrence will be used).
 
  remote.<name>.skipFetchAll::
-	If true, this remote will be skipped by default when updating
-	using linkgit:git-fetch[1] or the `update` subcommand of
-	linkgit:git-remote[1].
+	If true, this remote will be skipped when updating
+	using linkgit:git-fetch[1], the `update` subcommand of
+	linkgit:git-remote[1], and ignored by the prefetch task
+	of `git maitenance`.
 
  remote.<name>.receivepack::
  	The default program to execute on the remote side when pushing.  See
Documentation/git-maintenance.txt +3 -0
index 51d0f7e94b..9d96819133 100644
@@ -107,6 +107,9 @@ with the prefetch task, the objects necessary to complete a later real fetch
  would already be obtained, making the real fetch faster.  In the ideal case,
  it will just become an update to a bunch of remote-tracking branches without
  any object transfer.
++
+The `remote.<name>.skipFetchAll` configuration can be used to
+exclude a particular remote from getting prefetched.
 
  gc::
  	Clean up unnecessary files and optimize the local repository. "GC"
#5 lore raw

Re: Re*: What's cooking draft as of 2024-09-06 late night

In reply to Phillip Wood
Quoted 6 lines · Phillip Wood
Quoted 3 lines

The only place skipFetchAll is currently documented is in this large master list of configs that are easy to miss —
https://git-scm.com/docs/git-config.

We could perhaps expand the documentation of git fetch --all to mention skipFetchAll

Like this (interdiff at the end)?

--- >8 ---
Subject: [PATCH v2] doc: remote.*.skip{DefaultUpdate,FetchAll} stops prefetch

Back when 7cc91a2f (Add the configuration option skipFetchAll, 2009-11-09) added for the sole purpose of adding skipFetchAll as a synonym to skipDefaultUpdate, there was no explanation about the reason why it was needed., but these two configuration variables mean exactly the same thing.

Also, when we taught the "prefetch" task to "git maintenance" later, we did make it pay attention to the setting, but we forgot to document it.

Document these variables as synonyms that collectively implements the last-one-wins semantics, and also clarify that the prefetch task is also controlled by this variable.

---
 Documentation/config/remote.txt   | 13 +++++++------
 Documentation/fetch-options.txt   |  5 +++--
 Documentation/git-maintenance.txt |  3 +++
 3 files changed, 13 insertions(+), 8 deletions(-)
Documentation/config/remote.txt +7 -6
index 8efc53e836..36e771556c 100644
@@ -42,14 +42,15 @@ remote.<name>.mirror::
 	as if the `--mirror` option was given on the command line.
 
 remote.<name>.skipDefaultUpdate::
-	If true, this remote will be skipped by default when updating
-	using linkgit:git-fetch[1] or the `update` subcommand of
-	linkgit:git-remote[1].
+	A deprecated synonym to `remote.<name>.skipFetchAll` (if
+	both are set in the configuration files with different
+	values, the value of the last occurrence will be used).
 
 remote.<name>.skipFetchAll::
-	If true, this remote will be skipped by default when updating
-	using linkgit:git-fetch[1] or the `update` subcommand of
-	linkgit:git-remote[1].
+	If true, this remote will be skipped when updating
+	using linkgit:git-fetch[1], the `update` subcommand of
+	linkgit:git-remote[1], and ignored by the prefetch task
+	of `git maitenance`.
 
 remote.<name>.receivepack::
 	The default program to execute on the remote side when pushing.  See
Documentation/fetch-options.txt +3 -2
index e22b217fba..80838fe37e 100644
@@ -1,6 +1,7 @@
 --[no-]all::
-	Fetch all remotes. This overrides the configuration variable
-	`fetch.all`.
+	Fetch all remotes, except for the ones that has the
+	`remote.<name>.skipFetchAll` configuration variable set.
+	This overrides the configuration variable fetch.all`.
 
 -a::
 --append::
Documentation/git-maintenance.txt +3 -0
index 51d0f7e94b..9d96819133 100644
@@ -107,6 +107,9 @@ with the prefetch task, the objects necessary to complete a later real fetch
 would already be obtained, making the real fetch faster.  In the ideal case,
 it will just become an update to a bunch of remote-tracking branches without
 any object transfer.
++
+The `remote.<name>.skipFetchAll` configuration can be used to
+exclude a particular remote from getting prefetched.
 
 gc::
 	Clean up unnecessary files and optimize the local repository. "GC"

Interdiff:
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index e22b217fba..80838fe37e 100644
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -1,6 +1,7 @@
--[no-]all::
- Fetch all remotes. This overrides the configuration variable
- fetch.all.
+ Fetch all remotes, except for the ones that has the
+ remote.<name>.skipFetchAll configuration variable set.
+ This overrides the configuration variable fetch.all`.

-a::
--append::

Signature · 1 line
2.46.0-694-g7ca3d1f4f8
#6 lore raw

Re: Re*: What's cooking draft as of 2024-09-06 late night

Quoted 10 lines · Junio C Hamano
Quoted 6 lines · Phillip Wood
Quoted 3 lines

The only place skipFetchAll is currently documented is in this large master list of configs that are easy to miss —
https://git-scm.com/docs/git-config.

We could perhaps expand the documentation of git fetch --all to mention skipFetchAll

Like this (interdiff at the end)?

That looks good to me

Best Wishes

Phillip

Quoted 94 lines

--- >8 ---
Subject: [PATCH v2] doc: remote.*.skip{DefaultUpdate,FetchAll} stops prefetch

Back when 7cc91a2f (Add the configuration option skipFetchAll, 2009-11-09) added for the sole purpose of adding skipFetchAll as a synonym to skipDefaultUpdate, there was no explanation about the reason why it was needed., but these two configuration variables mean exactly the same thing.

Also, when we taught the "prefetch" task to "git maintenance" later, we did make it pay attention to the setting, but we forgot to document it.

Document these variables as synonyms that collectively implements the last-one-wins semantics, and also clarify that the prefetch task is also controlled by this variable.

---
  Documentation/config/remote.txt   | 13 +++++++------
  Documentation/fetch-options.txt   |  5 +++--
  Documentation/git-maintenance.txt |  3 +++
  3 files changed, 13 insertions(+), 8 deletions(-)
Documentation/config/remote.txt +7 -6
index 8efc53e836..36e771556c 100644
@@ -42,14 +42,15 @@ remote.<name>.mirror::
  	as if the `--mirror` option was given on the command line.
 
  remote.<name>.skipDefaultUpdate::
-	If true, this remote will be skipped by default when updating
-	using linkgit:git-fetch[1] or the `update` subcommand of
-	linkgit:git-remote[1].
+	A deprecated synonym to `remote.<name>.skipFetchAll` (if
+	both are set in the configuration files with different
+	values, the value of the last occurrence will be used).
 
  remote.<name>.skipFetchAll::
-	If true, this remote will be skipped by default when updating
-	using linkgit:git-fetch[1] or the `update` subcommand of
-	linkgit:git-remote[1].
+	If true, this remote will be skipped when updating
+	using linkgit:git-fetch[1], the `update` subcommand of
+	linkgit:git-remote[1], and ignored by the prefetch task
+	of `git maitenance`.
 
  remote.<name>.receivepack::
  	The default program to execute on the remote side when pushing.  See
Documentation/fetch-options.txt +3 -2
index e22b217fba..80838fe37e 100644
@@ -1,6 +1,7 @@
  --[no-]all::
-	Fetch all remotes. This overrides the configuration variable
-	`fetch.all`.
+	Fetch all remotes, except for the ones that has the
+	`remote.<name>.skipFetchAll` configuration variable set.
+	This overrides the configuration variable fetch.all`.
 
  -a::
  --append::
Documentation/git-maintenance.txt +3 -0
index 51d0f7e94b..9d96819133 100644
@@ -107,6 +107,9 @@ with the prefetch task, the objects necessary to complete a later real fetch
  would already be obtained, making the real fetch faster.  In the ideal case,
  it will just become an update to a bunch of remote-tracking branches without
  any object transfer.
++
+The `remote.<name>.skipFetchAll` configuration can be used to
+exclude a particular remote from getting prefetched.
 
  gc::
  	Clean up unnecessary files and optimize the local repository. "GC"

Interdiff:

   diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
   index e22b217fba..80838fe37e 100644
   --- a/Documentation/fetch-options.txt
   +++ b/Documentation/fetch-options.txt
   @@ -1,6 +1,7 @@
    --[no-]all::
   -	Fetch all remotes. This overrides the configuration variable
   -	`fetch.all`.
   +	Fetch all remotes, except for the ones that has the
   +	`remote.<name>.skipFetchAll` configuration variable set.
   +	This overrides the configuration variable fetch.all`.
    
    -a::
    --append::
#7 lore raw

Re: Re*: What's cooking draft as of 2024-09-06 late night

Quoted 7 lines · Phillip Wood
Quoted 6 lines · Junio C Hamano
Quoted 4 lines · Phillip Wood
Quoted 3 lines

The only place skipFetchAll is currently documented is in this large master list of configs that are easy to miss —
https://git-scm.com/docs/git-config.

Quoted 5 lines
Quoted 3 lines
Quoted 2 lines

We could perhaps expand the documentation of git fetch --all to mention skipFetchAll

Like this (interdiff at the end)?

That looks good to me

Thanks.