Commit Graph

16841 Commits

Author SHA1 Message Date
Junio C Hamano
f2bf477c7e Merge branch 'jt/repo-structure' into ps/ref-peeled-tags
* jt/repo-structure:
  builtin/repo: add progress meter for structure stats
  builtin/repo: add keyvalue and nul format for structure stats
  builtin/repo: add object counts in structure output
  builtin/repo: introduce structure subcommand
  ref-filter: export ref_kind_from_refname()
  ref-filter: allow NULL filter pattern
  builtin/repo: rename repo_info() to cmd_repo_info()
2025-10-22 07:47:24 -07:00
Justin Tobler
17215675b5 builtin/repo: add keyvalue and nul format for structure stats
All repository structure stats are outputted in a human-friendly table
form. This format is not suitable for machine parsing. Add a --format
option that supports three output modes: `table`, `keyvalue`, and `nul`.
The `table` mode is the default format and prints the same table output
as before.

With the `keyvalue` mode, each line of output contains a key-value pair
of a repository stat. The '=' character is used to delimit between keys
and values. The `nul` mode is similar to `keyvalue`, but key-values are
delimited by a NUL character instead of a newline. Also, instead of a
'=' character to delimit between keys and values, a newline character is
used. This allows stat values to support special characters without
having to cquote them. These two new modes provides output that is more
machine-friendly.

Signed-off-by: Justin Tobler <jltobler@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2025-10-21 14:40:38 -07:00
Justin Tobler
eb5cf58ffc builtin/repo: add object counts in structure output
The amount of objects in a repository can provide insight regarding its
shape. To surface this information, use the path-walk API to count the
number of reachable objects in the repository by object type. All
regular references are used to determine the reachable set of objects.
The object counts are appended to the same table containing the
reference information.

Signed-off-by: Justin Tobler <jltobler@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2025-10-21 14:40:38 -07:00
Justin Tobler
bbb2b93348 builtin/repo: introduce structure subcommand
The structure of a repository's history can have huge impacts on the
performance and health of the repository itself. Currently, Git lacks a
means to surface repository metrics regarding its structure/shape via a
single command. Acquiring this information requires users to be familiar
with the relevant data points and the various Git commands required to
surface them. To fill this gap, supplemental tools such as git-sizer(1)
have been developed.

To allow users to more readily identify repository structure related
information, introduce the "structure" subcommand in git-repo(1). The
goal of this subcommand is to eventually provide similar functionality
to git-sizer(1), but natively in Git.

The initial version of this command only iterates through all references
in the repository and tracks the count of branches, tags, remote refs,
and other reference types. The corresponding information is displayed in
a human-friendly table formatted in a very similar manner to
git-sizer(1). The width of each table column is adjusted automatically
to satisfy the requirements of the widest row contained.

Subsequent commits will surface additional relevant data points to
output and also provide other more machine-friendly output formats.

Based-on-patch-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Justin Tobler <jltobler@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2025-10-21 14:40:37 -07:00
Junio C Hamano
133d151831 The twenty-first batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2025-10-20 14:12:18 -07:00
Junio C Hamano
a23c82509f Merge branch 'kh/doc-continued-paragraph-fix'
Doc mark-up fixes.

* kh/doc-continued-paragraph-fix:
  doc: fix accidental literal blocks
2025-10-20 14:12:17 -07:00
Junio C Hamano
29b0700515 Merge branch 'dk/stash-apply-index'
Doc update.

* dk/stash-apply-index:
  doc: explain the impact of stash.index on --autostash options
2025-10-20 14:12:17 -07:00
Junio C Hamano
f229982df1 The twentieth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2025-10-17 14:02:17 -07:00
Junio C Hamano
ab447045ed Merge branch 'tb/doc-submitting-patches'
A few more things that patch authors can do to help maintainer to
keep track of their topics better.

* tb/doc-submitting-patches:
  SubmittingPatches: guidance for multi-series efforts
  SubmittingPatches: extend release-notes experiment to topic names
2025-10-17 14:02:17 -07:00
Junio C Hamano
cd6c082b44 Merge branch 'rs/add-patch-options-fix'
The code in "git add -p" and friends to iterate over hunks was
riddled with bugs, which has been corrected.

* rs/add-patch-options-fix:
  add-patch: reset "permitted" at loop start
  add-patch: let options a and d roll over like y and n
  add-patch: let options k and K roll over like j and J
  add-patch: let options y, n, j, and e roll over to next undecided
  add-patch: document that option J rolls over
  add-patch: improve help for options j, J, k, and K
2025-10-17 14:02:17 -07:00
Kristoffer Haugsbakk
4253630c6f RelNotes: sync with Git 2.51.1 fixups
Carry over the fixups from 8c3d7c5f (RelNotes: minor fixups before
2.51.1, 2025-10-15).

Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2025-10-16 09:30:45 -07:00
Junio C Hamano
143f58ef75 Sync with Git 2.51.1 2025-10-15 10:31:31 -07:00
Junio C Hamano
81f86aacc4 Git 2.51.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2025-10-15 10:29:35 -07:00
Junio C Hamano
ae8ea7c6bd Merge branch 'kh/doc-patch-id-markup-fix' into maint-2.51
Documentation mark-up fix.

* kh/doc-patch-id-markup-fix:
  doc: patch-id: fix accidental literal blocks
2025-10-15 10:29:35 -07:00
Junio C Hamano
554e474d03 Merge branch 'ja/doc-markup-attached-paragraph-fix' into maint-2.51
Documentation mark-up fix.

* ja/doc-markup-attached-paragraph-fix:
  doc: fix indentation of refStorage item in git-config(1)
  doc: change the markup of paragraphs following a nested list item
2025-10-15 10:29:35 -07:00
Junio C Hamano
92043e9460 Merge branch 'en/doc-merge-tree-describe-merge-base' into maint-2.51
Clarify the "--merge-base" command line option in "git merge-tree".

* en/doc-merge-tree-describe-merge-base:
  Documentation/git-merge-tree.adoc: clarify the --merge-base option
2025-10-15 10:29:35 -07:00
Junio C Hamano
d204057940 Merge branch 'mh/doc-credential-url-prefix' into maint-2.51
Doc update to describe a feature that has already been implemented.

* mh/doc-credential-url-prefix:
  docs/gitcredentials: describe URL prefix matching
2025-10-15 10:29:35 -07:00
Junio C Hamano
2a33cd6864 Merge branch 'ag/doc-sendmail-gmail-example-update' into maint-2.51
Doc update.

* ag/doc-sendmail-gmail-example-update:
  docs: update sendmail docs to use more secure SMTP server for Gmail
2025-10-15 10:29:34 -07:00
Junio C Hamano
e0a4669e56 Merge branch 'jc/doc-includeif-hasconfig-remote-url-fix' into maint-2.51
Doc mark-up fix.

* jc/doc-includeif-hasconfig-remote-url-fix:
  config: document includeIf conditions consistently
2025-10-15 10:29:34 -07:00
Junio C Hamano
2ab0f47bd3 Merge branch 'mm/worktree-doc-typofix' into maint-2.51
Docfix.

* mm/worktree-doc-typofix:
  docs: fix typo in worktree.adoc 'extension'
2025-10-15 10:29:34 -07:00
Junio C Hamano
2d9f2dc7ce Merge branch 'kh/doc-markup-fixes' into maint-2.51
Doc markup fixes.

* kh/doc-markup-fixes:
  doc: remove extra backtick for inline-verbatim
  doc: add missing backtick for inline-verbatim
2025-10-15 10:29:33 -07:00
Junio C Hamano
f07b97aa6e Merge branch 'km/alias-doc-markup-fix' into maint-2.51
Docfix.

* km/alias-doc-markup-fix:
  doc: fix formatting of function-wrap shell alias
2025-10-15 10:29:33 -07:00
Junio C Hamano
51195bdab2 Merge branch 'js/doc-sending-patch-via-thunderbird' into maint-2.51
Doc update.

* js/doc-sending-patch-via-thunderbird:
  doc/format-patch: adjust Thunderbird MUA hint to new add-on
2025-10-15 10:29:32 -07:00
Junio C Hamano
9c22d96e56 Merge branch 'kr/clone-synopsis-fix' into maint-2.51
Doc fix.

* kr/clone-synopsis-fix:
  docs: remove stray bracket from git-clone synopsis
2025-10-15 10:29:32 -07:00
Junio C Hamano
9740baaf0e Merge branch 'kh/doc-git-log-markup-fix' into maint-2.51
Doc update.

* kh/doc-git-log-markup-fix:
  doc: git-log: fix description list
2025-10-15 10:29:31 -07:00
Junio C Hamano
e04c0aded3 Merge branch 'ps/reflog-migrate-fixes' into maint-2.51
"git refs migrate" to migrate the reflog entries from a refs
backend to another had a handful of bugs squashed.

* ps/reflog-migrate-fixes:
  refs: fix invalid old object IDs when migrating reflogs
  refs: stop unsetting REF_HAVE_OLD for log-only updates
  refs/files: detect race when generating reflog entry for HEAD
  refs: fix identity for migrated reflogs
  ident: fix type of string length parameter
  builtin/reflog: implement subcommand to write new entries
  refs: export `ref_transaction_update_reflog()`
  builtin/reflog: improve grouping of subcommands
  Documentation/git-reflog: convert to use synopsis type
2025-10-15 10:29:28 -07:00
Kristoffer Haugsbakk
8c3d7c5f11 RelNotes: minor fixups before 2.51.1
Grammar and typo fixes. Also change “work it around” to “work around”.

Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2025-10-15 09:25:00 -07:00
Junio C Hamano
b660e2dcb9 Sync with 'maint' 2025-10-14 13:44:35 -07:00
Junio C Hamano
dba6e578b6 Prepare for 2.51.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2025-10-14 13:43:25 -07:00
Junio C Hamano
3bc761681f Merge branch 'kh/doc-fast-import-markup-fix' into maint-2.51
Doc mark-up fix.

* kh/doc-fast-import-markup-fix:
  doc: fast-import: replace literal block with paragraph
2025-10-14 13:40:55 -07:00
Junio C Hamano
12c542bbcf Merge branch 'kh/doc-config-typofix' into maint-2.51
Documentation typofix.

* kh/doc-config-typofix:
  doc: config: replace backtick with apostrophe for possessive
2025-10-14 13:40:55 -07:00
Junio C Hamano
fb3f8af737 Merge branch 'kh/doc-interpret-trailers-markup-fix' into maint-2.51
Fix missing single-quote pairs in a documentation page.

* kh/doc-interpret-trailers-markup-fix:
  doc: interpret-trailers: close all pairs of single quotes
2025-10-14 13:40:55 -07:00
Junio C Hamano
d227777796 Merge branch 'ds/doc-count-objects-fix' into maint-2.51
Docfix.

* ds/doc-count-objects-fix:
  count-objects: document count-objects pack
2025-10-14 13:40:54 -07:00
Junio C Hamano
7d050a531d Merge branch 'ja/asciidoc-doctor-verbatim-fixes' into maint-2.51
Doc mark-up fix.

* ja/asciidoc-doctor-verbatim-fixes:
  doc: fix asciidoc format compatibility in pretty-formats.adoc
2025-10-14 13:40:54 -07:00
Junio C Hamano
5b57e1e926 Merge branch 'js/progress-delay-fix' into maint-2.51
The start_delayed_progress() function in the progress eye-candy API
did not clear its internal state, making an initial delay value
larger than 1 second ineffective, which has been corrected.

* js/progress-delay-fix:
  progress: pay attention to (customized) delay time
2025-10-14 13:40:54 -07:00
Junio C Hamano
3778b8022d Merge branch 'ds/doc-ggg-pr-fork-clarify' into maint-2.51
Update the instruction to use of GGG in the MyFirstContribution
document to say that a GitHub PR could be made against `git/git`
instead of `gitgitgadget/git`.

* ds/doc-ggg-pr-fork-clarify:
  doc: clarify which remotes can be used with GitGitGadget
2025-10-14 13:40:53 -07:00
Junio C Hamano
0b4a263bd8 Merge branch 'js/doc-gitk-history' into maint-2.51
Manual page for "gitk" is updated with the current maintainer's
name.

* js/doc-gitk-history:
  doc/gitk: update reference to the external project
2025-10-14 13:40:53 -07:00
Junio C Hamano
f9f50d6348 Merge branch 'bc/doc-compat-object-format-not-working' into maint-2.51
The compatObjectFormat extension is used to hide an incomplete
feature that is not yet usable for any purpose other than
developing the feature further.  Document it as such to discourage
its use by mere mortals.

* bc/doc-compat-object-format-not-working:
  docs: note that extensions.compatobjectformat is incomplete
2025-10-14 13:40:52 -07:00
Junio C Hamano
aea86cf00f The nineteenth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2025-10-14 12:56:09 -07:00
Junio C Hamano
44dee53a30 Merge branch 'jc/optional-path'
Configuration variables that take a pathname as a value
(e.g. blame.ignorerevsfile) can be marked as optional by prefixing
":(optoinal)" before its value.

* jc/optional-path:
  parseopt: values of pathname type can be prefixed with :(optional)
  config: values of pathname type can be prefixed with :(optional)
  t7500: fix GIT_EDITOR shell snippet
  t7500: make each piece more independent
2025-10-14 12:56:09 -07:00
Junio C Hamano
1003719fb7 Merge branch 'je/doc-push-upstream'
Documentation updates.

* je/doc-push-upstream:
  doc: git-push: add explanation of `git push origin main`
  doc: git-push: clarify "what to push"
  doc: git-push: clarify "where to push"
  doc: add an UPSTREAM BRANCHES section to pull/push/fetch
  doc: git-push: clarify intro
2025-10-14 12:56:09 -07:00
Junio C Hamano
ca5a44b15c Merge branch 'kh/doc-patch-id-markup-fix'
Documentation mark-up fix.

* kh/doc-patch-id-markup-fix:
  doc: patch-id: fix accidental literal blocks
2025-10-14 12:56:08 -07:00
Junio C Hamano
11f5a2264e Merge branch 'jn/doc-help-translaing-pretty-options'
Documentation for "git log --pretty" options has been updated
to make it easier to translate.

* jn/doc-help-translaing-pretty-options:
  doc: do not break sentences into "lego" pieces
2025-10-14 12:56:08 -07:00
Junio C Hamano
38553df73c Merge branch 'jn/doc-synopsis'
Doc-mark-up modernization continues.

* jn/doc-synopsis:
  doc: convert git worktree to synopsis style
  doc: convert git tag to synopsis style
  doc: convert git-stash.adoc to synopis style
2025-10-14 12:56:08 -07:00
Junio C Hamano
ac7d021f06 The eighteenth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2025-10-13 22:00:35 -07:00
Junio C Hamano
f50f046794 Merge branch 'kn/reftable-consistency-checks'
The reftable backend learned to sanity check its on-disk data more
carefully.

* kn/reftable-consistency-checks:
  refs/reftable: add fsck check for checking the table name
  reftable: add code to facilitate consistency checks
  fsck: order 'fsck_msg_type' alphabetically
  Documentation/fsck-msgids: remove duplicate msg id
  reftable: check for trailing newline in 'tables.list'
  refs: move consistency check msg to generic layer
  refs: remove unused headers
2025-10-13 22:00:35 -07:00
Junio C Hamano
c96add7552 Merge branch 'ja/doc-markup-attached-paragraph-fix'
Documentation mark-up fix.

* ja/doc-markup-attached-paragraph-fix:
  doc: fix indentation of refStorage item in git-config(1)
  doc: change the markup of paragraphs following a nested list item
2025-10-13 22:00:35 -07:00
Junio C Hamano
4b71b29477 The seventeenth batch
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2025-10-10 12:51:46 -07:00
Junio C Hamano
472c3f5607 Merge branch 'en/doc-merge-tree-describe-merge-base'
Clarify the "--merge-base" command line option in "git merge-tree".

* en/doc-merge-tree-describe-merge-base:
  Documentation/git-merge-tree.adoc: clarify the --merge-base option
2025-10-10 12:51:46 -07:00
Junio C Hamano
4750afe9b9 Merge branch 'rj/doc-missing-technical-docs'
Doc updates.

* rj/doc-missing-technical-docs:
  doc: add some missing technical documents
2025-10-10 12:51:46 -07:00