Accommodate for pu having been renamed to seen #668
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
/submit |
|
Error: git fetch https://github.com/gitgitgadget/git -- +refs/notes/gitgitgadget:refs/notes/gitgitgadget +refs/heads/maint:refs/remotes/upstream/maint +refs/heads/master:refs/remotes/upstream/master +refs/heads/next:refs/remotes/upstream/next +refs/heads/pu:refs/remotes/upstream/pu +refs/pull/668/head:refs/pull/668/head +refs/pull/668/merge:refs/pull/668/merge failed: 128, |
|
/submit |
|
Submitted as pull.668.git.1592924655.gitgitgadget@gmail.com |
![gitgitgadget[bot]](https://avatars.githubusercontent.com/in/12836?s=60&v=4){kind=small}
| @@ -1179,8 +1179,8 @@ look at the section below this one for some context.) | |||
| [[after-approval]] | |||
There was a problem hiding this comment.
On the Git mailing list, Đoàn Trần Công Danh wrote (reply to this):
Hi Dscho,
On 2020-06-23 15:04:13+0000, Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com> wrote:
> diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt
> index 0a5c8b7d493..492e573856f 100644
> --- a/Documentation/git-ls-remote.txt
> +++ b/Documentation/git-ls-remote.txt
> @@ -101,9 +101,9 @@ f25a265a342aed6041ab0cc484224d9ca54b6f41 refs/tags/v0.99.1
> 7ceca275d047c90c0c7d5afb13ab97efdf51bd6e refs/tags/v0.99.3
> c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2
> 0918385dbd9656cab0d1d81ba7453d49bbc16250 refs/tags/junio-gpg-pub
> -$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc
> +$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc
rc is not with us anymore.
Should we replace it with next, too?
> 5fe978a5381f1fbad26a80e682ddd2a401966740 refs/heads/master
> -c781a84b5204fb294c9ccc79f8b3baceeb32c061 refs/heads/pu
> +c781a84b5204fb294c9ccc79f8b3baceeb32c061 refs/heads/seen
> $ git remote add korg http://www.kernel.org/pub/scm/git/git.git
> $ git ls-remote --tags korg v\*
> d6602ec5194c87b0fc87103ca4d67251c76f233a refs/tags/v0.99
--
Danh
There was a problem hiding this comment.
On the Git mailing list, Junio C Hamano wrote (reply to this):
Đoàn Trần Công Danh <congdanhqx@gmail.com> writes:
> Hi Dscho,
>
> On 2020-06-23 15:04:13+0000, Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com> wrote:
>> diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt
>> index 0a5c8b7d493..492e573856f 100644
>> --- a/Documentation/git-ls-remote.txt
>> +++ b/Documentation/git-ls-remote.txt
>> @@ -101,9 +101,9 @@ f25a265a342aed6041ab0cc484224d9ca54b6f41 refs/tags/v0.99.1
>> 7ceca275d047c90c0c7d5afb13ab97efdf51bd6e refs/tags/v0.99.3
>> c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2
>> 0918385dbd9656cab0d1d81ba7453d49bbc16250 refs/tags/junio-gpg-pub
>> -$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc
>> +$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc
>
> rc is not with us anymore.
>
> Should we replace it with next, too?
I do not think so. I think we never had 'rc'.
I think what the above example is demonstrating is this.
SYNOPSIS calls the last command line arguments <refs>; they are
actually mere patterns (which is how these command line
arguments are described in the documentation). It is *not* an
error if no refs match a particular pattern.
And because we have no refs that match the pattern "rc", we only see
"master" and "pu" (now "seen") from the command.
I see a couple of possible improvements here:
- The "<refs>...::" documentation should explain what kind of
pattern match is performed here. I recall these originally were
just tail matches, but the rule might have been made more
flexible over time.
- The example should first explain the setting. The first sample
depends on the current (./.) repository having these tags or it
would not work (showing the sample upfront and explaining the
outcome shown in the sample would work well in this case,
e.g. "we can see that in the current repository, there are tags
X, Y and Z"). The second one at least needs to say two things:
the sample repository does not have a branch called 'rc' and that
is why it is not shown, and it is not an error for patterns to
produce no match.
Thanks.
>
>> 5fe978a5381f1fbad26a80e682ddd2a401966740 refs/heads/master
>> -c781a84b5204fb294c9ccc79f8b3baceeb32c061 refs/heads/pu
>> +c781a84b5204fb294c9ccc79f8b3baceeb32c061 refs/heads/seen
>> $ git remote add korg http://www.kernel.org/pub/scm/git/git.git
>> $ git ls-remote --tags korg v\*
>> d6602ec5194c87b0fc87103ca4d67251c76f233a refs/tags/v0.99
There was a problem hiding this comment.
On the Git mailing list, Johannes Schindelin wrote (reply to this):
This message is in MIME format. The first part should be readable text,
while the remaining parts are likely unreadable without MIME-aware tools.
--8323328-1867953520-1592947936=:54
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Hi Junio & Danh,
On Tue, 23 Jun 2020, Junio C Hamano wrote:
> =C4=90o=C3=A0n Tr=E1=BA=A7n C=C3=B4ng Danh <congdanhqx@gmail.com> write=
s:
>
> > On 2020-06-23 15:04:13+0000, Johannes Schindelin via GitGitGadget <git=
gitgadget@gmail.com> wrote:
> >> diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-r=
emote.txt
> >> index 0a5c8b7d493..492e573856f 100644
> >> --- a/Documentation/git-ls-remote.txt
> >> +++ b/Documentation/git-ls-remote.txt
> >> @@ -101,9 +101,9 @@ f25a265a342aed6041ab0cc484224d9ca54b6f41 refs/tag=
s/v0.99.1
> >> 7ceca275d047c90c0c7d5afb13ab97efdf51bd6e refs/tags/v0.99.3
> >> c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2
> >> 0918385dbd9656cab0d1d81ba7453d49bbc16250 refs/tags/junio-gpg-pub
> >> -$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu =
rc
> >> +$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master see=
n rc
> >
> > rc is not with us anymore.
> >
> > Should we replace it with next, too?
>
> I do not think so. I think we never had 'rc'.
Indeed, and the context given in the patch demonstrates that no `rc` is
shown, so I assumed the same things as Junio explained here:
> I think what the above example is demonstrating is this.
>
> SYNOPSIS calls the last command line arguments <refs>; they are
> actually mere patterns (which is how these command line
> arguments are described in the documentation). It is *not* an
> error if no refs match a particular pattern.
>
> And because we have no refs that match the pattern "rc", we only see
> "master" and "pu" (now "seen") from the command.
Precisely.
> I see a couple of possible improvements here:
>
> - The "<refs>...::" documentation should explain what kind of
> pattern match is performed here. I recall these originally were
> just tail matches, but the rule might have been made more
> flexible over time.
>
> - The example should first explain the setting. The first sample
> depends on the current (./.) repository having these tags or it
> would not work (showing the sample upfront and explaining the
> outcome shown in the sample would work well in this case,
> e.g. "we can see that in the current repository, there are tags
> X, Y and Z"). The second one at least needs to say two things:
> the sample repository does not have a branch called 'rc' and that
> is why it is not shown, and it is not an error for patterns to
> produce no match.
Those sound like wonderful #leftoverbits to me.
Thank you,
Dscho
>
> Thanks.
>
> >
> >> 5fe978a5381f1fbad26a80e682ddd2a401966740 refs/heads/master
> >> -c781a84b5204fb294c9ccc79f8b3baceeb32c061 refs/heads/pu
> >> +c781a84b5204fb294c9ccc79f8b3baceeb32c061 refs/heads/seen
> >> $ git remote add korg http://www.kernel.org/pub/scm/git/git.git
> >> $ git ls-remote --tags korg v\*
> >> d6602ec5194c87b0fc87103ca4d67251c76f233a refs/tags/v0.99
>
--8323328-1867953520-1592947936=:54--
There was a problem hiding this comment.
On the Git mailing list, Đoàn Trần Công Danh wrote (reply to this):
On 2020-06-23 12:31:45-0700, Junio C Hamano <gitster@pobox.com> wrote:
> Đoàn Trần Công Danh <congdanhqx@gmail.com> writes:
> > On 2020-06-23 15:04:13+0000, Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com> wrote:
> >> diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt
> >> index 0a5c8b7d493..492e573856f 100644
> >> --- a/Documentation/git-ls-remote.txt
> >> +++ b/Documentation/git-ls-remote.txt
> >> @@ -101,9 +101,9 @@ f25a265a342aed6041ab0cc484224d9ca54b6f41 refs/tags/v0.99.1
> >> 7ceca275d047c90c0c7d5afb13ab97efdf51bd6e refs/tags/v0.99.3
> >> c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2
> >> 0918385dbd9656cab0d1d81ba7453d49bbc16250 refs/tags/junio-gpg-pub
> >> -$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc
> >> +$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc
> >
> > rc is not with us anymore.
> >
> > Should we replace it with next, too?
>
> I do not think so. I think we never had 'rc'.
You're right.
Actually, I didn't read the context after the diff but went to
215a7ad1ef (Big tool rename., 2005-09-07) instead.
In that tree, there's a line for refs/heads/rc:
b1d096f2926c4e37c9c0b6a7bf2119bedaa277cb refs/heads/rc
Not sure why it was there in the past but it's fixed in
6077d36299 (ls-remote doc: fix example invocation on git.git,
2013-06-22)
> I think what the above example is demonstrating is this.
>
> SYNOPSIS calls the last command line arguments <refs>; they are
> actually mere patterns (which is how these command line
> arguments are described in the documentation). It is *not* an
> error if no refs match a particular pattern.
>
> And because we have no refs that match the pattern "rc", we only see
> "master" and "pu" (now "seen") from the command.
>
> I see a couple of possible improvements here:
>
> - The "<refs>...::" documentation should explain what kind of
> pattern match is performed here. I recall these originally were
> just tail matches, but the rule might have been made more
> flexible over time.
>
> - The example should first explain the setting. The first sample
> depends on the current (./.) repository having these tags or it
> would not work (showing the sample upfront and explaining the
> outcome shown in the sample would work well in this case,
> e.g. "we can see that in the current repository, there are tags
> X, Y and Z"). The second one at least needs to say two things:
> the sample repository does not have a branch called 'rc' and that
> is why it is not shown, and it is not an error for patterns to
> produce no match.
I guess this is a leftover from 6077d36299 (ls-remote doc: fix example
invocation on git.git, 2013-06-22), if this was documented together
with said commit, it'll be less confusing.
>
> Thanks.
>
> >
> >> 5fe978a5381f1fbad26a80e682ddd2a401966740 refs/heads/master
> >> -c781a84b5204fb294c9ccc79f8b3baceeb32c061 refs/heads/pu
> >> +c781a84b5204fb294c9ccc79f8b3baceeb32c061 refs/heads/seen
> >> $ git remote add korg http://www.kernel.org/pub/scm/git/git.git
> >> $ git ls-remote --tags korg v\*
> >> d6602ec5194c87b0fc87103ca4d67251c76f233a refs/tags/v0.99
--
Danh
|
This branch is now known as |
|
This patch series was integrated into seen via git@d4243b4. |
|
This patch series was integrated into seen via git@c0f4b66. |
dscho
force-pushed
the
accommodate-for-pu-having-been-renamed-to-seen
branch
from
17adbd5 to
c8e356c
Compare
|
/submit |
|
Submitted as pull.668.v2.git.1593010120.gitgitgadget@gmail.com |
| @@ -1179,8 +1179,8 @@ look at the section below this one for some context.) | |||
| [[after-approval]] | |||
There was a problem hiding this comment.
On the Git mailing list, Denton Liu wrote (reply to this):
Hi Dscho,
On Wed, Jun 24, 2020 at 02:48:38PM +0000, Johannes Schindelin via GitGitGadget wrote:
> diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt
> index abc0dc6bc7..0965b60884 100644
> --- a/Documentation/gitworkflows.txt
> +++ b/Documentation/gitworkflows.txt
> @@ -85,15 +85,15 @@ As a given feature goes from experimental to stable, it also
>
> There is a fourth official branch that is used slightly differently:
>
> -* 'pu' (proposed updates) is an integration branch for things that are
> - not quite ready for inclusion yet (see "Integration Branches"
> - below).
> +* `seen` (patches seen by the maintainer) is an integration branch for
> + things that are not quite ready for inclusion yet (see "Integration
> + Branches" below).
Tiny nit: we should use sq instead of backticks to match the style of
the rest of the document.
-Denton
|
On the Git mailing list, Denton Liu wrote (reply to this): |
|
On the Git mailing list, Junio C Hamano wrote (reply to this): |
|
On the Git mailing list, Junio C Hamano wrote (reply to this): |
|
On the Git mailing list, Junio C Hamano wrote (reply to this): |
|
On the Git mailing list, Denton Liu wrote (reply to this): |
|
On the Git mailing list, Junio C Hamano wrote (reply to this): |
|
This patch series was integrated into seen via git@61ad2ba. |
As of "What's cooking in git.git (Jun 2020, #4; Mon, 22)", there is no longer any `pu` branch, but a `seen` branch. While we technically do not even need to update the manual pages, it makes sense to update them because they clearly talk about branches in git.git. Please note that in two instances, this patch not only updates the branch name, but also the description "(proposed updates)". Where appropriate, quotes have been added for readability. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This patch tries to rewrite history a bit: the mail contents that have been added to Git's source code are actually fixed, we cannot change them in hindsight. But as the `pu` branch _was_ renamed, and as the documents were added to Git's source code not so much as historical record, but to describe the status quo, let's pretend that we have a time machine and adjust the provided information accordingly. Where appropriate, quotes were added for readability. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
As our test suite partially reflects how we work in the Git project, it is natural that the branch name `pu` was used in a couple places. Since that branch was renamed to `seen`, let's use the new name consistently. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho
force-pushed
the
accommodate-for-pu-having-been-renamed-to-seen
branch
from
c8e356c to
e38ade2
Compare
|
/submit |
|
Submitted as pull.668.v3.git.1593087539.gitgitgadget@gmail.com |
|
On the Git mailing list, Junio C Hamano wrote (reply to this): |
|
This patch series was integrated into seen via git@acc59a7. |
|
This patch series was integrated into next via git@06c9e5a. |
|
On the Git mailing list, Kaartic Sivaraam wrote (reply to this): |
|
This patch series was integrated into seen via git@9c496a2. |
|
On the Git mailing list, Johannes Schindelin wrote (reply to this): |
|
On the Git mailing list, Johannes Schindelin wrote (reply to this): |
|
On the Git mailing list, Johannes Schindelin wrote (reply to this): |
|
On the Git mailing list, Junio C Hamano wrote (reply to this): |
|
On the Git mailing list, Johannes Schindelin wrote (reply to this): |
|
This patch series was integrated into seen via git@e311cab. |
|
This patch series was integrated into seen via git@8a78e4d. |
|
This patch series was integrated into next via git@8a78e4d. |
|
This patch series was integrated into master via git@8a78e4d. |
|
Closed via 8a78e4d. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patch series adjusts Git's own source code to reflect that change.
Please note that even with these patches, there are still a couple places where
puis used:upload-pack.c, where a variable namedpuis short form for "pack-objects updates".Changes since v2:
One accidental quoting change in v1 was reverted.
Rebased onto
maint(no merge conflicts, so it does not actually change anything).Changes since v1:
Rebased onto
master(no conflicts, so it is safe, and it is more robust than basing the patches onseenwhich already contains v1 of these patches).Adjusted the quoting to match https://lore.kernel.org/git/e250f1bb100aca94c914f1b2d38a3849c2566aea.1592909867.git.liu.denton@gmail.com/.
Cc: Denton Liu liu.denton@gmail.com