global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-25 17:33:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

patch-id: use “patch ID” throughout

Browse Source 
The “Description” section decided to introduce and use the term “patch
ID” for the ID value itself.  Let’s use the same term on the options as
well.

Also make to sure to use bare “ID” instead of “id”.

Signed-off-by: Kristoffer Haugsbakk <code@khaugsbakk.name>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Kristoffer Haugsbakk
2026-01-08 07:28:17 +01:00
committed by Junio C Hamano
parent 92a61fe44d
commit 285659cc98
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/git-patch-id.adoc
View File

@@ -31,7 +31,7 @@ OPTIONS
-------
`--verbatim`::
Calculate the patch-id of the input as it is given, do not strip
Calculate the patch ID of the input as it is given, do not strip
any whitespace.
+
This is the default if `patchid.verbatim` is `true`.
@@ -51,18 +51,18 @@ This is the default if `patchid.verbatim` is `true`.
or produced when an "unstable" hash (see `--unstable` below) is
configured - even when used on a diff output taken without any use
of `-O<orderfile>`, thereby making existing databases storing such
"unstable" or historical patch-ids unusable.
"unstable" or historical patch IDs unusable.
- All whitespace within the patch is ignored and does not affect the id.
- All whitespace within the patch is ignored and does not affect the ID.
--
+
This is the default if `patchid.stable` is set to `true`.
`--unstable`::
Use an "unstable" hash as the patch ID. With this option,
the result produced is compatible with the patch-id value produced
the result produced is compatible with the patch ID value produced
by Git 1.9 and older and whitespace is ignored. Users with pre-existing
databases storing patch-ids produced by Git 1.9 and older (who do not deal
databases storing patch IDs produced by Git 1.9 and older (who do not deal
with reordered patches) may want to use this option.
+
This is the default.

4
builtin/patch-id.c
View File

@@ -228,9 +228,9 @@ int cmd_patch_id(int argc,
int opts = 0;
struct option builtin_patch_id_options[] = {
OPT_CMDMODE(0, "unstable", &opts,
N_("use the unstable patch-id algorithm"), 1),
N_("use the unstable patch ID algorithm"), 1),
OPT_CMDMODE(0, "stable", &opts,
N_("use the stable patch-id algorithm"), 2),
N_("use the stable patch ID algorithm"), 2),
OPT_CMDMODE(0, "verbatim", &opts,
N_("don't strip whitespace from the patch"), 3),
OPT_END()