From: Junio C Hamano <gitster@pobox.com>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: "Torsten Bögershausen" <tboegi@web.de>, git@vger.kernel.org
Subject: Re: t4216-log-bloom.sh broken ?
Date: Thu, 02 May 2024 13:05:40 -0700 [thread overview]
Message-ID: <xmqqwmocc73f.fsf@gitster.g> (raw)
In-Reply-To: <xmqq7cgcdm4f.fsf@gitster.g> (Junio C. Hamano's message of "Thu, 02 May 2024 12:55:44 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> ... it is a very unsatisfactory workaround, compared to a world where we
> do not have to worry about such a broken mv (perhaps by noticing a
> broken macOS /bin/mv and automatically doing mv () { mv -f "$@" }
> for them).
>
> I am curious what other differences Torsten will find out between
> good macs and bad ones. Perhaps we can narrow down the bad apples?
In any case, while we are waiting, I did a few "grep":
$ git grep 'mv \(.*\)\.tmp \1' t
t/lib-t6000.sh: mv sed.script.tmp sed.script
t/t7508-status.sh: rm "$1" && mv "$1".tmp "$1"
t/t8011-blame-split-file.sh: mv one.tmp one &&
t/t8011-blame-split-file.sh: mv two.tmp two &&
t/t9400-git-cvsserver-server.sh: mv merge.tmp merge &&
t/t9400-git-cvsserver-server.sh: mv merge.tmp merge &&
t/t9802-git-p4-filetype.sh: mv empty-symlink,v.tmp empty-symlink,v
$ git grep 'mv "\(.*\)\.tmp" "\1"' t
t/lib-chunk.sh: mv "$fn.tmp" "$fn"
t/t3404-rebase-interactive.sh: mv "$1.tmp" "$1"
t/t5515-fetch-merge-logic.sh: mv "$file.tmp" "$file"
t/t7600-merge.sh:) >"$1.tmp" && mv "$1.tmp" "$1"
t/t9001-send-email.sh: mv "$1.tmp" "$1"
t/t9001-send-email.sh: mv "$1.tmp" "$1"
$ git grep 'mv \(.*\)+ \1' t
t/t4025-hunk-header.sh: mv file+ file
t/t6402-merge-rename.sh: mv A+ A &&
t/t6402-merge-rename.sh: mv A+ A &&
t/t6432-merge-recursive-space-options.sh: mv text.txt+ text.txt &&
t/t6432-merge-recursive-space-options.sh: mv text.txt+ text.txt &&
There is nothing other than the one we found in lib-chunk.sh that
work on files under .git/objects/ that are made read-only, so we
should be OK with a workaround like the attached.
t/lib-chunk.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git c/t/lib-chunk.sh w/t/lib-chunk.sh
index a7cd9c3c6d..9f01df190b 100644
--- c/t/lib-chunk.sh
+++ w/t/lib-chunk.sh
@@ -13,5 +13,6 @@ corrupt_chunk_file () {
fn=$1; shift
perl "$TEST_DIRECTORY"/lib-chunk/corrupt-chunk-file.pl \
"$@" <"$fn" >"$fn.tmp" &&
- mv "$fn.tmp" "$fn"
+ # some vintages of macOS 'mv' fails to overwrite a read-only file.
+ mv -f "$fn.tmp" "$fn"
}
next prev parent reply other threads:[~2024-05-02 20:06 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-29 17:12 [ANNOUNCE] Git v2.45.0 Junio C Hamano
2024-05-01 17:39 ` rsbecker
2024-05-02 5:56 ` t4216-log-bloom.sh broken ? Torsten Bögershausen
2024-05-02 16:06 ` Junio C Hamano
2024-05-02 18:59 ` Torsten Bögershausen
2024-05-02 19:26 ` SZEDER Gábor
2024-05-02 19:55 ` Junio C Hamano
2024-05-02 20:05 ` Junio C Hamano [this message]
2024-05-02 20:15 ` Junio C Hamano
2024-05-02 20:51 ` Torsten Bögershausen
2024-05-02 21:20 ` Junio C Hamano
2024-05-02 16:26 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqwmocc73f.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=szeder.dev@gmail.com \
--cc=tboegi@web.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).