From 7539e569efb401a6301245bad48aedd47e8d405b Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 24 Nov 2023 03:35:12 +0000 Subject: [PATCH 1/4] doc: update links to current pages It's somewhat traditional to respect sites' self-identification. Signed-off-by: Josh Soref Signed-off-by: Junio C Hamano Cherry-picked-from: 65175d9ea26bebeb9d69977d0e75efc0e88dbced Signed-off-by: Johannes Sixt --- gitk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitk b/gitk index df3ba2ea99b310..dd80ab8f3bab4a 100755 --- a/gitk +++ b/gitk @@ -12472,7 +12472,7 @@ if {[tk windowingsystem] eq "aqua"} { catch { # follow the XDG base directory specification by default. See - # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html + # https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html if {[info exists env(XDG_CONFIG_HOME)] && $env(XDG_CONFIG_HOME) ne ""} { # XDG_CONFIG_HOME environment variable is set set config_file [file join $env(XDG_CONFIG_HOME) git gitk] From ed87b13a504a323c19e9f823fa06ed191a7be62f Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Fri, 24 Nov 2023 03:35:13 +0000 Subject: [PATCH 2/4] doc: switch links to https These sites offer https versions of their content. Using the https versions provides some protection for users. Signed-off-by: Josh Soref Signed-off-by: Junio C Hamano Cherry-picked-from: d05b08cd52cfda627f1d865bdfe6040a2c9521b5 Signed-off-by: Johannes Sixt --- gitk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitk b/gitk index dd80ab8f3bab4a..7a087f123d7563 100755 --- a/gitk +++ b/gitk @@ -11956,7 +11956,7 @@ proc formatdate {d} { } # This list of encoding names and aliases is distilled from -# http://www.iana.org/assignments/character-sets. +# https://www.iana.org/assignments/character-sets. # Not all of them are supported by Tcl. set encoding_aliases { { ANSI_X3.4-1968 iso-ir-6 ANSI_X3.4-1986 ISO_646.irv:1991 ASCII From c18400c6bb04f4e8875c1930db72ddd9b94649ca Mon Sep 17 00:00:00 2001 From: Taylor Blau Date: Mon, 8 Apr 2024 11:51:44 -0400 Subject: [PATCH 3/4] Makefile(s): avoid recipe prefix in conditional statements In GNU Make commit 07fcee35 ([SV 64815] Recipe lines cannot contain conditional statements, 2023-05-22) and following, conditional statements may no longer be preceded by a tab character (which Make refers to as the recipe prefix). There are a handful of spots in our various Makefile(s) which will break in a future release of Make containing 07fcee35. For instance, trying to compile the pre-image of this patch with the tip of make.git results in the following: $ make -v | head -1 && make GNU Make 4.4.90 config.mak.uname:842: *** missing 'endif'. Stop. The kernel addressed this issue in 82175d1f9430 (kbuild: Replace tabs with spaces when followed by conditionals, 2024-01-28). Address the issues in Git's tree by applying the same strategy. When a conditional word (ifeq, ifneq, ifdef, etc.) is preceded by one or more tab characters, replace each tab character with 8 space characters with the following: find . -type f -not -path './.git/*' -name Makefile -or -name '*.mak' | xargs perl -i -pe ' s/(\t+)(ifn?eq|ifn?def|else|endif)/" " x (length($1) * 8) . $2/ge unless /\\$/ ' The "unless /\\$/" removes any false-positives (like "\telse \" appearing within a shell script as part of a recipe). After doing so, Git compiles on newer versions of Make: $ make -v | head -1 && make GNU Make 4.4.90 GIT_VERSION = 2.44.0.414.gfac1dc44ca9 [...] $ echo $? 0 Reported-by: Dario Gjorgjevski Signed-off-by: Taylor Blau Signed-off-by: Junio C Hamano Cherry-picked-from: 728b9ac0c3b93aaa4ea80280c591deb198051785 Signed-off-by: Johannes Sixt --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5bdd52a6ebfa72..e1f0aff4a191d3 100644 --- a/Makefile +++ b/Makefile @@ -33,9 +33,9 @@ ifdef NO_MSGFMT MSGFMT ?= $(TCL_PATH) po/po2msg.sh else MSGFMT ?= msgfmt - ifneq ($(shell $(MSGFMT) --tcl -l C -d . /dev/null 2>/dev/null; echo $$?),0) + ifneq ($(shell $(MSGFMT) --tcl -l C -d . /dev/null 2>/dev/null; echo $$?),0) MSGFMT := $(TCL_PATH) po/po2msg.sh - endif + endif endif PO_TEMPLATE = po/gitk.pot From 92999a42db1c5f43f330e4f2bca4026b5b81576f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 25 Nov 2024 12:32:21 +0900 Subject: [PATCH 4/4] Git 2.47.1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.47.1.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/RelNotes/2.47.1.txt b/Documentation/RelNotes/2.47.1.txt index 6d7a4d98fbe0ce..39206c09fdbe62 100644 --- a/Documentation/RelNotes/2.47.1.txt +++ b/Documentation/RelNotes/2.47.1.txt @@ -24,3 +24,8 @@ Fixes since Git 2.47 * A "git fetch" from the superproject going down to a submodule used a wrong remote when the default remote names are set differently between them. + + * The "gitk" project tree has been synchronized again with its new + maintainer, Johannes Sixt. + +Also contains minor documentation updates and code clean-ups.