Merge branch 'jc/test-workaround-broken-mv' into maint-2.45

gitster · gitster · commit 0d7b7484c9b3 · 2024-05-31T15:28:18.000-07:00
Tests that try to corrupt in-repository files in chunked format did
not work well on macOS due to its broken "mv", which has been
worked around.

* jc/test-workaround-broken-mv:
  t/lib-chunk: work around broken "mv" on some vintage of macOS
diff --git a/t/lib-chunk.sh b/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"
 }

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,6 @@ corrupt_chunk_file () {`
`13`	`13`	`fn=$1; shift`
`14`	`14`	`perl "$TEST_DIRECTORY"/lib-chunk/corrupt-chunk-file.pl \`
`15`	`15`	`"$@" <"$fn" >"$fn.tmp" &&`
`16`		`- mv "$fn.tmp" "$fn"`
	`16`	`+ # some vintages of macOS 'mv' fails to overwrite a read-only file.`
	`17`	`+ mv -f "$fn.tmp" "$fn"`
`17`	`18`	`}`