Merge tag 'l10n-2.41.0-2' of https://github.com/git-l10n/git-po
l10n-2.41.0-2
* tag 'l10n-2.41.0-2' of https://github.com/git-l10n/git-po:
l10n: zh_TW.po: Git 2.41.0
l10n: sv.po: Update Swedish translation (5515t0f0u)
l10n: Update Catalan translation
l10n: Update German translation
l10n: po-id for 2.41 (round 1)
l10n: Update Catalan translation
l10n: tr: Update Turkish translations for 2.41.0
l10n: fr.po v2.41.0 rnd2
l10n: fr.po v2.41.0 rnd1
l10n: fr: fix translation of stash save help
l10n: zh_CN: Git 2.41.0 round #1
l10n: bg.po: Updated Bulgarian translation (5515t)
l10n: update uk localization
l10n: uk: remove stale lines
l10n: uk: add initial translation
l10n: TEAMS: Update pt_PT repo link
diff --git a/Documentation/RelNotes/2.41.0.txt b/Documentation/RelNotes/2.41.0.txt
index c77484c..8a9e170 100644
--- a/Documentation/RelNotes/2.41.0.txt
+++ b/Documentation/RelNotes/2.41.0.txt
@@ -65,9 +65,9 @@
has symbolic links inside its $GIT_DIR; an error message when that
happens has been updated.
- * "git branch --format=..." and "git format-patch --format=..."
- learns "--omit-empty" to hide refs that whose formatting result
- becomes an empty string from the output.
+ * The "--format=..." option of "git for-each-ref", "git branch", and
+ "git tag" commands learn "--omit-empty" to hide refs whose
+ formatting results in an empty string from the output.
* The sendemail-validate validate hook learned to pass the total
number of input files and where in the sequence each invocation is
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 85d7d7a..2ef084f 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.41.0-rc1
+DEF_VER=v2.41.0-rc2
LF='
'
diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh
index e58bfbf..a63d0cc 100755
--- a/t/t1092-sparse-checkout-compatibility.sh
+++ b/t/t1092-sparse-checkout-compatibility.sh
@@ -2089,22 +2089,32 @@
test_cmp actual expect
'
-test_expect_success 'write-tree on all' '
+test_expect_success 'write-tree' '
init_repos &&
+ test_all_match git write-tree &&
+
write_script edit-contents <<-\EOF &&
echo text >>"$1"
EOF
+ # make a change inside the sparse cone
run_on_all ../edit-contents deep/a &&
- run_on_all git update-index deep/a &&
+ test_all_match git update-index deep/a &&
test_all_match git write-tree &&
+ test_all_match git status --porcelain=v2 &&
+ # make a change outside the sparse cone
run_on_all mkdir -p folder1 &&
run_on_all cp a folder1/a &&
run_on_all ../edit-contents folder1/a &&
- run_on_all git update-index folder1/a &&
- test_all_match git write-tree
+ test_all_match git update-index folder1/a &&
+ test_all_match git write-tree &&
+ test_all_match git status --porcelain=v2 &&
+
+ # check that SKIP_WORKTREE files are not materialized
+ test_path_is_missing sparse-checkout/folder2/a &&
+ test_path_is_missing sparse-index/folder2/a
'
test_expect_success 'sparse-index is not expanded: write-tree' '
