From: Johannes Sixt <j6t@kdbg.org>
To: Takashi Iwai <tiwai@suse.de>
Cc: Denton Liu <liu.denton@gmail.com>,
Eric Huber <echuber2@illinois.edu>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Avi Halachmi <avihpit@yahoo.com>,
Christoph Sommer <sommer@cms-labs.org>,
Paul Mackerras <paulus@ozlabs.org>,
git@vger.kernel.org
Subject: Re: [PATCH 1/2] gitk: Add a basic support of SHA256 repositories into Gitk
Date: Thu, 8 May 2025 08:20:40 +0200 [thread overview]
Message-ID: <9bb1699a-ec99-40b3-bd6a-00e809d77d0d@kdbg.org> (raw)
In-Reply-To: <20250320154136.23262-2-tiwai@suse.de>
Am 20.03.25 um 16:41 schrieb Takashi Iwai:
> From: Rostislav Krasny <rosti.bsd@gmail.com>
>
> This PR makes Gitk working on both SHA256 and SHA1 repositories without
> errors/crashes. I made it by changing and testing the gitk script of Git
> for Windows [https://gitforwindows.org/] version 2.32.0.windows.1 that
> is a little bit different than the mainstream 2.32.0 version.
>
> Still not fixed functionality: [1] There is the "Auto-select SHA1
> (length)" configuration preference that affects "Copy commit reference"
> on both SHA1 and SHA256 repositories.
>
> A new "Auto-select SHA256 (length)" configuration preference should be
> added and used on SHA256 repositories instead of the old one. Since I'm
> not familiar with Tcl/Tk and this issue isn't critical I didn't
> implement it.
>
> [ Changes from the original patch:
> * Discard the changes for generic words (e.g. "Commit ID"), so that
> translations can be still applied after this patch
> * Simplify the regexp check in gotocommit as suggested in the
> previous review
> -- tiwai ]
The message should be updated to not mention the evolution of the change
and what is not relevant anymore or not relevant in this patch.
>
> Signed-off-by: Rostislav Krasny <rosti.bsd@gmail.com>
> Link: https://patchwork.kernel.org/project/git/patch/pull.979.git.1623687519832.gitgitgadget@gmail.com
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
> @@ -8920,11 +8932,11 @@ proc gotocommit {} {
> set id $headids($sha1string)
> } else {
> set id [string tolower $sha1string]
> - if {[regexp {^[0-9a-f]{4,39}$} $id]} {
> + if {[regexp {^[0-9a-f]{4,63}$} $id]} {
This doesn't use $hashlength. Should it?
Also watch out space vs. TAB.
> @@ -12524,6 +12539,18 @@ if {$tclencoding == {}} {
> puts stderr "Warning: encoding $gitencoding is not supported by Tcl/Tk"
> }
>
> +set objformat [exec git rev-parse --show-object-format]
> +if {$objformat eq "sha1"} {
> + set hashlength 40
> +} elseif {$objformat eq "sha256"} {
> + set hashlength 64
> +} else {
> + error_popup "[mc "Not supported hash algorithm:"] {$objformat}"
This looks strange. Where is the $objformat substituted?
> + exit 1
> +}
> +set hashalgorithm [string toupper $objformat]
> +unset objformat
Why not set hashalgorithm right away, without using a temporary
objformat? Why set it at all here? It's unused.
> +
> set gui_encoding [encoding system]
> catch {
> set enc [exec git config --get gui.encoding]
next prev parent reply other threads:[~2025-05-08 6:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-20 15:41 [PATCH 0/2] gitk: Support of SHA256 repos Takashi Iwai
2025-03-20 15:41 ` [PATCH 1/2] gitk: Add a basic support of SHA256 repositories into Gitk Takashi Iwai
2025-05-08 6:20 ` Johannes Sixt [this message]
2025-05-12 14:29 ` Takashi Iwai
2025-03-20 15:41 ` [PATCH 2/2] gitk: Add auto-select length preference for SHA256 Takashi Iwai
2025-05-08 6:20 ` Johannes Sixt
2025-05-12 14:36 ` Takashi Iwai
2025-05-08 6:21 ` [PATCH 0/2] gitk: Support of SHA256 repos Johannes Sixt
2025-05-12 14:45 ` Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9bb1699a-ec99-40b3-bd6a-00e809d77d0d@kdbg.org \
--to=j6t@kdbg.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=avihpit@yahoo.com \
--cc=echuber2@illinois.edu \
--cc=git@vger.kernel.org \
--cc=liu.denton@gmail.com \
--cc=paulus@ozlabs.org \
--cc=sommer@cms-labs.org \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).