From 3393baa82caf1ef9cfef431d84aff17e9d88076f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 21 Oct 2022 13:48:21 -0700 Subject: Autogenerated HTML docs for v2.38.1-143-g1fc3c --- RelNotes/2.39.0.txt | 22 +++++++++++++++++++++- git-symbolic-ref.html | 20 ++++++++++++++++++-- git-symbolic-ref.txt | 11 ++++++++++- howto/coordinate-embargoed-releases.html | 2 +- howto/keep-canonical-history-correct.html | 2 +- howto/maintain-git.html | 2 +- howto/new-command.html | 2 +- howto/rebase-from-internal-branch.html | 2 +- howto/rebuild-from-update-hook.html | 2 +- howto/recover-corrupted-blob-object.html | 2 +- howto/recover-corrupted-object-harder.html | 2 +- howto/revert-a-faulty-merge.html | 2 +- howto/revert-branch-rebase.html | 2 +- howto/separating-topic-branches.html | 2 +- howto/setup-git-server-over-http.html | 2 +- howto/update-hook-example.html | 2 +- howto/use-git-daemon.html | 2 +- howto/using-merge-subtree.html | 2 +- howto/using-signed-tag-in-pull-request.html | 2 +- 19 files changed, 65 insertions(+), 20 deletions(-) diff --git a/RelNotes/2.39.0.txt b/RelNotes/2.39.0.txt index 04ef0edcb..815366182 100644 --- a/RelNotes/2.39.0.txt +++ b/RelNotes/2.39.0.txt @@ -10,6 +10,16 @@ UI, Workflows & Features * By default, use of fsmonitor on a repository on networked filesystem is disabled. Add knobs to make it workable on macOS. + * After checking out a "branch" that is a symbolic-ref that points at + another branch, "git symbolic-ref HEAD" reports the underlying + branch, not the symbolic-ref the user gave checkout as argument. + The command learned the "--no-recurse" option to stop after + dereferencing a symbolic-ref only once. + + * "git branch --edit-description @{-1}" is now a way to edit branch + description of the branch you were on before switching to the + current branch. + Performance, Internal Implementation, Development Support etc. -------------------------------------------------------------- @@ -37,6 +47,9 @@ Performance, Internal Implementation, Development Support etc. in C99. (merge 438c2f859b ab/coding-guidelines-c99 later to maint). + * Avoid false-positive from LSan whose assumption may be broken with + higher optimization levels. + Fixes since v2.38 ----------------- @@ -116,6 +129,12 @@ Fixes since v2.38 syntax for struct. (merge 54795d37d9 jh/struct-zero-init-with-older-clang later to maint). + * Giving "--invert-grep" and "--all-match" without "--grep" to the + "git log" command resulted in an attempt to access grep pattern + expression structure that has not been allocated, which has been + corrected. + (merge db84376f98 ab/grep-simplify-extended-expression later to maint). + * Other code cleanup, docfix, build fix, etc. (merge c34a6bd291 so/diff-merges-cleanup later to maint). (merge 5e7c8b75e7 ab/test-malloc-with-sanitize-leak later to maint). @@ -130,4 +149,5 @@ Fixes since v2.38 (merge 7c07f36ad2 ab/unused-annotation later to maint). (merge f7669676d0 rs/use-fspathncmp later to maint). (merge a677d3c416 pw/remove-rebase-p-test later to maint). - (merge e3733b646d rs/archive-dedup-printf later to maint). \ No newline at end of file + (merge e3733b646d rs/archive-dedup-printf later to maint). + (merge 413bc6d20a ds/cmd-main-reorder later to maint). diff --git a/git-symbolic-ref.html b/git-symbolic-ref.html index 9e80f4f89..052bc45f4 100644 --- a/git-symbolic-ref.html +++ b/git-symbolic-ref.html @@ -750,7 +750,7 @@ git-symbolic-ref(1) Manual Page 
git symbolic-ref [-m <reason>] <name> <ref>
-git symbolic-ref [-q] [--short] <name>
+git symbolic-ref [-q] [--short] [--no-recurse] <name>
 git symbolic-ref --delete [-q] <name>
@@ -810,6 +810,22 @@ a regular file whose contents is ref: refs/heads/master.

+--recurse +
+
+--no-recurse +
+
+

+ When showing the value of <name> as a symbolic ref, if + <name> refers to another symbolic ref, follow such a chain + of symbolic refs until the result no longer points at a + symbolic ref (--recurse, which is the default). + --no-recurse stops after dereferencing only a single level + of symbolic ref. +

+
+
-m
@@ -847,7 +863,7 @@ name is not a symbolic ref, or 128 if another error occurs.

diff --git a/git-symbolic-ref.txt b/git-symbolic-ref.txt index ef68ad2b7..102c83eb1 100644 --- a/git-symbolic-ref.txt +++ b/git-symbolic-ref.txt @@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] 'git symbolic-ref' [-m ] -'git symbolic-ref' [-q] [--short] +'git symbolic-ref' [-q] [--short] [--no-recurse] 'git symbolic-ref' --delete [-q] DESCRIPTION @@ -46,6 +46,15 @@ OPTIONS When showing the value of as a symbolic ref, try to shorten the value, e.g. from `refs/heads/master` to `master`. +--recurse:: +--no-recurse:: + When showing the value of as a symbolic ref, if + refers to another symbolic ref, follow such a chain + of symbolic refs until the result no longer points at a + symbolic ref (`--recurse`, which is the default). + `--no-recurse` stops after dereferencing only a single level + of symbolic ref. + -m:: Update the reflog for with . This is valid only when creating or updating a symbolic ref. diff --git a/howto/coordinate-embargoed-releases.html b/howto/coordinate-embargoed-releases.html index a562dcb31..81164400f 100644 --- a/howto/coordinate-embargoed-releases.html +++ b/howto/coordinate-embargoed-releases.html @@ -873,7 +873,7 @@ Thanks, diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index cff0fdba2..ecdb5530a 100644 --- a/howto/keep-canonical-history-correct.html +++ b/howto/keep-canonical-history-correct.html @@ -938,7 +938,7 @@ tip of your master again and redo the two merges:

diff --git a/howto/maintain-git.html b/howto/maintain-git.html index 5e75d327f..3faaa34a7 100644 --- a/howto/maintain-git.html +++ b/howto/maintain-git.html @@ -1469,7 +1469,7 @@ $ git update-ref -d $mf/ai/topic diff --git a/howto/new-command.html b/howto/new-command.html index c15530283..22f4acf79 100644 --- a/howto/new-command.html +++ b/howto/new-command.html @@ -863,7 +863,7 @@ letter [PATCH 0/n]. diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index 0f9918b97..be161fccc 100644 --- a/howto/rebase-from-internal-branch.html +++ b/howto/rebase-from-internal-branch.html @@ -895,7 +895,7 @@ the #1' commit.

diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index 179edc686..45d567d06 100644 --- a/howto/rebuild-from-update-hook.html +++ b/howto/rebuild-from-update-hook.html @@ -847,7 +847,7 @@ This is still crude and does not protect against simultaneous diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index 23acc3447..54707545f 100644 --- a/howto/recover-corrupted-blob-object.html +++ b/howto/recover-corrupted-blob-object.html @@ -880,7 +880,7 @@ thing.

diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index 7a34b7fcd..10699bb60 100644 --- a/howto/recover-corrupted-object-harder.html +++ b/howto/recover-corrupted-object-harder.html @@ -1189,7 +1189,7 @@ int main(int argc, char **argv) diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index 271cd83d6..9551aae2b 100644 --- a/howto/revert-a-faulty-merge.html +++ b/howto/revert-a-faulty-merge.html @@ -1025,7 +1025,7 @@ P---o---o---M---x---x---W---x---M2 diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index cd16b2f52..c101ced05 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html @@ -907,7 +907,7 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index 48090935b..62fd52cb9 100644 --- a/howto/separating-topic-branches.html +++ b/howto/separating-topic-branches.html @@ -841,7 +841,7 @@ o---o"master" diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index b60e0f813..8b6b480d5 100644 --- a/howto/setup-git-server-over-http.html +++ b/howto/setup-git-server-over-http.html @@ -1071,7 +1071,7 @@ help diagnosing the problem, but removes security checks.

diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index 089cc26b0..613240ece 100644 --- a/howto/update-hook-example.html +++ b/howto/update-hook-example.html @@ -930,7 +930,7 @@ that JC can make non-fast-forward pushes on it.

diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index 49cc5eb9b..29d51cf7d 100644 --- a/howto/use-git-daemon.html +++ b/howto/use-git-daemon.html @@ -791,7 +791,7 @@ a good practice to put the paths after a "--" separator.

diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index 79d7f6c8a..83d213e34 100644 --- a/howto/using-merge-subtree.html +++ b/howto/using-merge-subtree.html @@ -848,7 +848,7 @@ Please note that if the other project merges from you, then it will diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html index ac943c81f..e70a70590 100644 --- a/howto/using-signed-tag-in-pull-request.html +++ b/howto/using-signed-tag-in-pull-request.html @@ -952,7 +952,7 @@ as part of the merge commit.

-- cgit 1.2.3-korg