Skip to content

Accommodate for pu having been renamed to seen

Johannes Schindelin via GitGitGadget git 3 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest3 patches 5 repliesIn review
  2. v23 patches 9 repliesSuperseded
  3. v13 patches 4 repliesSuperseded

Changes in v3 from the cover letter

* One accidental quoting change in v1 was reverted.

* Rebased onto maint (no merge conflicts, so it does not actually change anything).

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3docs: adjust for the recent rename of `pu` to `seen`Documentation/MyFirstContribution.txt Documentation/SubmittingPatches Documentation/git-fetch.txt +4 more+27 -270 replies
2/3docs: adjust the technical overview for the rename `pu` -> `seen`Documentation/howto/maintain-git.txt Documentation/howto/rebase-from-internal-branch.txt Documentation/howto/revert-branch-rebase.txt +1 more+61 -610 replies
3/3tests: reference `seen` wherever `pu` was referencedt/t5505-remote.sh t/t5516-fetch-push.sh t/t9902-completion.sh+14 -140 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v3 yet.

Read the v3 thread

Cover letter [PATCH v3 0/3] Accommodate for pu having been renamed to seen

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 pu is used:

* In the translations. These are legitimate words in languages that are not English (as in "gpg n'a pas pu signer les données" where "pu" is French for the English "could").
* In upload-pack.c, where a variable named pu is 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 on seen which already contains v1 of these patches).

* Adjusted the quoting to match
https://lore.kernel.org/git/e250f1bb100aca94c914f1b2d38a3849c2566aea.1592909867.git.liu.denton@gmail.com/
.

Johannes Schindelin (3):
docs: adjust for the recent rename of pu to seen
docs: adjust the technical overview for the rename pu -> seen
tests: reference seen wherever pu was referenced

 Documentation/MyFirstContribution.txt         |  4 +-
 Documentation/SubmittingPatches               | 10 ++--
 Documentation/git-fetch.txt                   |  8 +--
 Documentation/git-ls-remote.txt               |  4 +-
 Documentation/giteveryday.txt                 | 10 ++--
 Documentation/gitworkflows.txt                | 16 +++---
 Documentation/howto/maintain-git.txt          | 52 +++++++++----------
 .../howto/rebase-from-internal-branch.txt     | 32 ++++++------
 Documentation/howto/revert-branch-rebase.txt  | 32 ++++++------
 Documentation/howto/update-hook-example.txt   |  6 +--
 Documentation/user-manual.txt                 |  2 +-
 t/t5505-remote.sh                             |  8 +--
 t/t5516-fetch-push.sh                         | 16 +++---
 t/t9902-completion.sh                         |  4 +-
 14 files changed, 102 insertions(+), 102 deletions(-)

base-commit: af6b65d45ef179ed52087e80cb089f6b2349f4ec
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-668%2Fdscho%2Faccommodate-for-pu-having-been-renamed-to-seen-v3
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-668/dscho/accommodate-for-pu-having-been-renamed-to-seen-v3
Pull-Request: https://github.com/gitgitgadget/git/pull/668

Range-diff vs v2:

1: 35e3dafd6a ! 1: 13e03e0e65 docs: adjust for the recent rename of pu to seen
@@ Documentation/gitworkflows.txt: As a given feature goes from experimental to sta
-* '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 ++* 'seen' (patches seen by the maintainer) is an integration branch for
+ things that are not quite ready for inclusion yet (see "Integration
+ Branches" below).

 2:  c2bcfdcb5b = 2:  13f3501c84 docs: adjust the technical overview for the rename `pu` -> `seen`
 3:  c8e356c02f = 3:  e38ade2ee0 tests: reference `seen` wherever `pu` was referenced
Signature · 1 line
gitgitgadget