Skip to content

Tags: gitgitgadget/git

Tags

pr-2020/jnavila/doc_git_status-v1

Toggle pr-2020/jnavila/doc_git_status-v1's commit message
doc: convert git-status, git remote and git stage to synopsis style

The changes are basically the expected stuff for synopsis conversion, and a
few cases of "imperative mood" style.

Additionally, this series has two special commits

 * fix to the comparison of synopsis and help, to allow using synopsis
   paragraph elsewhere in manpages
 * the "ascii art" tables in git-status are converted to plain asciidoc
   tables. The alignment output is managed by the asciidoc processor.

The second patch is a RFC as to whether we should convert our tables or not.
For the translations of the manual pages, this setup simplifies the
maintenance, because we are able to export each table cell as a separate
segment.

Jean-Noël Avila (5):
  doc: fix t0450-txt-doc-vs-help to select only first synopsis block
  doc: convert git-status to synopsis style
  doc: convert git-status tables to AsciiDoc format
  doc: convert git stage to use synopsis block
  doc: convert git-remote to synopsis style

 Documentation/git-remote.adoc | 106 +++++-----
 Documentation/git-stage.adoc  |   4 +-
 Documentation/git-status.adoc | 356 +++++++++++++++++-----------------
 t/t0450-txt-doc-vs-help.sh    |   2 +-
 4 files changed, 238 insertions(+), 230 deletions(-)

base-commit: c4a0c88

Submitted-As: https://lore.kernel.org/git/[email protected]

pr-git-2135/sambostock/expire-missing-worktrees-v2

Toggle pr-git-2135/sambostock/expire-missing-worktrees-v2's commit message
worktree: clarify --expire applies to missing worktrees

Changes from v1:

 * Use 'prune' instead of 'expire' when describing the --expire option's
   effect on missing worktrees, since the terminology is clearer.

Sam Bostock (2):
  worktree: clarify --expire applies to missing worktrees
  worktree: use 'prune' instead of 'expire' in help text

 Documentation/git-worktree.adoc | 2 +-
 builtin/worktree.c              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

base-commit: c4a0c88

Submitted-As: https://lore.kernel.org/git/[email protected]
In-Reply-To: https://lore.kernel.org/git/[email protected]

pr-git-2135/sambostock/expire-missing-worktrees-v1

Toggle pr-git-2135/sambostock/expire-missing-worktrees-v1's commit message
worktree: clarify --expire applies to missing worktrees

From: Sam Bostock <[email protected]>

The `--expire` option for `git worktree list` and `git worktree prune`
only affects worktrees whose working directory path no longer exists.
The help text did not make this clear, and the documentation
inconsistently used "unused" for prune but "missing" for list.

This updates the help text and documentation to consistently describe
these as "missing worktrees".

Signed-off-by: Sam Bostock <[email protected]>

Submitted-As: https://lore.kernel.org/git/[email protected]

pr-git-2134/sambostock/validate-bundle-uri-v2

Toggle pr-git-2134/sambostock/validate-bundle-uri-v2's commit message
bundle-uri: validate that bundle entries have a uri

From: Sam Bostock <[email protected]>

When a bundle list config file has a typo like 'url' instead of 'uri',
or simply omits the uri field, the bundle entry is created but
bundle->uri remains NULL. This causes a segfault when copy_uri_to_file()
passes the NULL to starts_with().

Signed-off-by: Sam Bostock <[email protected]>

Submitted-As: https://lore.kernel.org/git/[email protected]
In-Reply-To: https://lore.kernel.org/git/[email protected]

pr-git-2133/HaraldNordgren/no-indicators-v1

Toggle pr-git-2133/HaraldNordgren/no-indicators-v1's commit message
diff: add --no-indicators option

From: Harald Nordgren <[email protected]>

Add --no-indicators to replace '+', '-', and ' ' indicators in the
left margin with spaces. Colors are preserved, allowing diffs to be
distinguished by color alone.

This is useful when copy-pasting diff output, as the indicators no
longer need to be manually removed.

Signed-off-by: Harald Nordgren <[email protected]>

Submitted-As: https://lore.kernel.org/git/[email protected]

pr-2016/jnavila/doc_small_fixups-v2

Toggle pr-2016/jnavila/doc_small_fixups-v2's commit message
doc: flock of small fixes to various documentation files

This second version only splits the changes in two commits, one addressing
asciidoc markup, the other fixing basic style issues.

Jean-Noël Avila (2):
  doc: fix asciidoc markup issues in several files
  doc: correct minor wording issues

 Documentation/git-checkout.adoc   |  2 +-
 Documentation/git-rebase.adoc     |  2 +-
 Documentation/git-repack.adoc     |  6 +++---
 Documentation/git-send-email.adoc | 26 +++++++++++++-------------
 Documentation/git-worktree.adoc   |  2 +-
 5 files changed, 19 insertions(+), 19 deletions(-)

base-commit: d8af7ca

Submitted-As: https://lore.kernel.org/git/[email protected]
In-Reply-To: https://lore.kernel.org/git/[email protected]

pr-git-2134/sambostock/validate-bundle-uri-v1

Toggle pr-git-2134/sambostock/validate-bundle-uri-v1's commit message
bundle-uri: validate that bundle entries have a uri

From: Sam Bostock <[email protected]>

When a bundle list config file has a typo like 'url' instead of 'uri',
or simply omits the uri field, the bundle entry is created but
bundle->uri remains NULL. This causes a segfault when copy_uri_to_file()
passes the NULL to starts_with().

Signed-off-by: Sam Bostock <[email protected]>

Submitted-As: https://lore.kernel.org/git/[email protected]

pr-git-2132/AZero13/twice-v2

Toggle pr-git-2132/AZero13/twice-v2's commit message
repository: remove duplicate free of cache->squash_msg

From: Greg Funni <[email protected]>

Thankfully, it is set to NULL, so no security consequences.
However, this is still a mistake that must be rectified.

Signed-off-by: Greg Funni <[email protected]>

Submitted-As: https://lore.kernel.org/git/[email protected]
In-Reply-To: https://lore.kernel.org/git/[email protected]

pr-git-2132/AZero13/twice-v1

Toggle pr-git-2132/AZero13/twice-v1's commit message
repository: cache->squash_msg is freed twice

From: Greg Funni <[email protected]>

Thankfully, it is set to NULL, so no security consequences.
However, this is still a mistake that must be rectified.

Signed-off-by: Greg Funni <[email protected]>

Submitted-As: https://lore.kernel.org/git/[email protected]

pr-git-2131/AZero13/fixopen-v1

Toggle pr-git-2131/AZero13/fixopen-v1's commit message
open: check fd_flags value before calling fcntl

From: AZero13 <[email protected]>

Otherwise, fcntl can be called with invalid fd_flags.

Signed-off-by: Greg Funni <[email protected]>

Submitted-As: https://lore.kernel.org/git/[email protected]