git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Sixt <j6t@kdbg.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: rsbecker@nexbridge.com, 'Patrick Steinhardt' <ps@pks.im>,
	git@vger.kernel.org, 'Todd Zullinger' <tmz@pobox.com>
Subject: [GIT PULL] git-gui: fix for: [ANNOUNCE] Git v2.50.0-rc1 - Test Failed
Date: Fri, 6 Jun 2025 07:57:02 +0200	[thread overview]
Message-ID: <4f390ad8-6c30-493c-952e-d1f079a7f6ac@kdbg.org> (raw)
In-Reply-To: <xmqqikl97u1l.fsf@gitster.g>

The following changes since commit 61f8788fe9d362efb112f69a58cf0510a7e49ee0:

  Merge branch 'pks-meson-support' of github.com:pks-t/git-gui (2025-05-29 10:01:14 +0200)

are available in the Git repository at:

  https://github.com/j6t/git-gui.git master

for you to fetch changes up to 765f1db2b5a890c0fa01f8976f197a8483357afe:

  git-gui: don't delete source files when auto_mkindex fails (2025-06-06 07:43:37 +0200)

----------------------------------------------------------------
commit 765f1db2b5a890c0fa01f8976f197a8483357afe
Author: Johannes Sixt <j6t@kdbg.org>
Date:   Fri Jun 6 07:41:42 2025 +0200

    git-gui: don't delete source files when auto_mkindex fails
    
    Commit 2cc5b0facfa4 (git-gui: extract script to generate "tclIndex",
    2025-03-11) converted commands in a Makefile rule to a shell script.
    In this process, the Makefile variable $@ had to be replaced by the
    file name that it represents, 'lib/tclIndex'. However, the occurrence
    in `rm -f $@` was missed. In a shell script, $@ expands to all
    command line arguments, which happen to be the source files lib/*.tcl
    in this case. Needless to say that we do not want to remove source
    files during a build. Replace $@ by the intended 'lib/tclIndex'.
    
    Reported-by: Randall S. Becker <rsbecker@nexbridge.com>
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>

diff --git a/generate-tclindex.sh b/generate-tclindex.sh
index 36e3a0bd90ee..0b031d8339c4 100755
--- a/generate-tclindex.sh
+++ b/generate-tclindex.sh
@@ -23,7 +23,7 @@ then
 	: ok
 else
 	 echo >&2 "    * $TCL_PATH failed; using unoptimized loading"
-	 rm -f $@
+	 rm -f lib/tclIndex
 	 echo '# Autogenerated by git-gui Makefile' >lib/tclIndex
 	 echo >>lib/tclIndex
 	 echo "class.tcl" >>lib/tclIndex


  reply	other threads:[~2025-06-06  5:57 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-06-03 17:02 [ANNOUNCE] Git v2.50.0-rc1 Junio C Hamano
2025-06-03 22:33 ` [ANNOUNCE] Git v2.50.0-rc1 - Test Failed rsbecker
2025-06-03 22:45   ` rsbecker
2025-06-04 13:51     ` Todd Zullinger
2025-06-04 15:17       ` Junio C Hamano
2025-06-04 19:25         ` Johannes Sixt
2025-06-05  8:09           ` rsbecker
2025-06-05  8:56             ` Patrick Steinhardt
2025-06-05 20:27               ` rsbecker
2025-06-05 21:11                 ` Johannes Sixt
2025-06-05 21:33                   ` Junio C Hamano
2025-06-06  5:57                     ` Johannes Sixt [this message]
2025-07-22 17:45                     ` [GIT PULL] git-gui: Sync with 2.50.1, Tcl >= 8.6, git >= 2.36 Johannes Sixt
2025-06-05 21:44                   ` [ANNOUNCE] Git v2.50.0-rc1 - Test Failed rsbecker
2025-06-05 22:06                     ` Junio C Hamano
2025-06-05 23:38                       ` 'Todd Zullinger'
2025-06-06  7:20                         ` rsbecker

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=4f390ad8-6c30-493c-952e-d1f079a7f6ac@kdbg.org \
    --to=j6t@kdbg.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=ps@pks.im \
    --cc=rsbecker@nexbridge.com \
    --cc=tmz@pobox.com \
    /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).