Bump git version to 2.37.2

2 files changed, 130 insertions, 84 deletions

diff --git a/PKGBUILD b/PKGBUILD
index ccea892..7eb9e7f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git-mistress
-pkgver=2.37.1
+pkgver=2.37.2
 pkgrel=1
 pkgdesc='the fast distributed version control system'
 arch=('x86_64')
@@ -33,12 +33,12 @@ source=("https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar."{xz,sign}
         'git-daemon.socket'
         'git-sysusers.conf'
         'default-branch.patch')
-sha256sums=('405d4a0ff6e818d1f12b3e92e1ac060f612adcb454f6299f70583058cb508370'
-            'SKIP'
+sha256sums=('1c3d9c821c4538e7a6dac30a4af8bd8dcfe4f651f95474c526b52f83406db003'
+            'c17dacdb836150949905a5a2990faf0efbc3843c14b12c524cda9d77d0cb6af4'
             '14c0b67cfe116b430645c19d8c4759419657e6809dfa28f438c33a005245ad91'
             'ac4c90d62c44926e6d30d18d97767efc901076d4e0283ed812a349aece72f203'
             '7630e8245526ad80f703fac9900a1328588c503ce32b37b9f8811674fcda4a45'
-            'acfaf69ed4b383ac9cb4764e391cc9db430a172d06f684b90bfff1cd43b78bfd')
+            'b61dc8d002f73aa96e565841a2923453418f7ce27d29ba9e2bad7f4ae10044c2')
 
 _make_paths=(
   prefix='/usr'
@@ -59,16 +59,16 @@ build() {
   cd "$srcdir/git-$pkgver"
   patch -p1 < "$srcdir"/default-branch.patch
 
-  make \
+  make -j$(nproc)  \
     "${_make_paths[@]}" \
     "${_make_options[@]}" \
     all man
 
-  make -C contrib/credential/gnome-keyring
-  make -C contrib/credential/libsecret
-  make -C contrib/subtree "${_make_paths[@]}" all man
-  make -C contrib/mw-to-git "${_make_paths[@]}" all
-  make -C contrib/diff-highlight "${_make_paths[@]}"
+  make -j$(nproc) -C contrib/credential/gnome-keyring
+  make -j$(nproc) -C contrib/credential/libsecret
+  make -j$(nproc) -C contrib/subtree "${_make_paths[@]}" all man
+  make -j$(nproc) -C contrib/mw-to-git "${_make_paths[@]}" all
+  make -j$(nproc) -C contrib/diff-highlight "${_make_paths[@]}"
 }
 
 # check() {
@@ -81,7 +81,7 @@ build() {
 #   # which is caused by 'git rebase' trying to use builduser's SHELL inside the
 #   # build chroot (i.e.: /usr/bin/nologin)
 #   SHELL=/bin/sh \
-#   make \
+#   make -j$(nproc) \
 #     "${_make_paths[@]}" \
 #     "${_make_options[@]}" \
 #     NO_SVN_TESTS=y \
@@ -94,7 +94,7 @@ build() {
 package() {
   cd "$srcdir/git-$pkgver"
   
-  make \
+  make -j$(nproc) \
     "${_make_paths[@]}" \
     "${_make_options[@]}" \
     DESTDIR="$pkgdir" \
@@ -110,15 +110,15 @@ package() {
   # https://gitlab.gnome.org/GNOME/libgnome-keyring/commit/6a5adea4aec93
   install -m 0755 contrib/credential/gnome-keyring/git-credential-gnome-keyring \
       "$pkgdir"/usr/lib/git-core/git-credential-gnome-keyring
-  make -C contrib/credential/gnome-keyring clean
+  make -j$(nproc) -C contrib/credential/gnome-keyring clean
   # libsecret credentials helper
   install -m 0755 contrib/credential/libsecret/git-credential-libsecret \
       "$pkgdir"/usr/lib/git-core/git-credential-libsecret
-  make -C contrib/credential/libsecret clean
+  make -j$(nproc) -C contrib/credential/libsecret clean
   # subtree installation
-  make -C contrib/subtree "${_make_paths[@]}" DESTDIR="$pkgdir" install install-man
+  make -j$(nproc) -C contrib/subtree "${_make_paths[@]}" DESTDIR="$pkgdir" install install-man
   # mediawiki installation
-  make -C contrib/mw-to-git "${_make_paths[@]}" DESTDIR="$pkgdir" install
+  make -j$(nproc) -C contrib/mw-to-git "${_make_paths[@]}" DESTDIR="$pkgdir" install
   # the rest of the contrib stuff
   find contrib/ -name '.gitignore' -delete
   cp -a ./contrib/* "$pkgdir"/usr/share/git/
diff --git a/default-branch.patch b/default-branch.patch
index 631591f..092ed1c 100644
--- a/default-branch.patch
+++ b/default-branch.patch
@@ -1,8 +1,8 @@
 diff --git a/po/bg.po b/po/bg.po
-index 8328531..16570fb 100644
+index 934784fe52..9f23047ed0 100644
 --- a/po/bg.po
 +++ b/po/bg.po
-@@ -7364,7 +7364,7 @@ msgid ""
+@@ -19006,7 +19006,7 @@ msgid ""
  "\n"
  "\tgit config --global init.defaultBranch <name>\n"
  "\n"
@@ -11,11 +11,20 @@ index 8328531..16570fb 100644
  "'development'. The just-created branch can be renamed via this command:\n"
  "\n"
  "\tgit branch -m <name>\n"
+@@ -19017,7 +19017,7 @@ msgstr ""
+ "\n"
+ "    git config --global init.defaultBranch ИМЕ\n"
+ "\n"
+-"Често ползвани варианти вместо „master“ са „main“, „trunk“ и „development“.\n"
++"Често ползвани варианти вместо „mistress“ са „main“, „trunk“ и „development“.\n"
+ "За да преименувата току що създаден клон, изпълнете:\n"
+ "\n"
+ "    git branch -m ИМЕ\n"
 diff --git a/po/ca.po b/po/ca.po
-index 524330a..4b31f5d 100644
+index 80c430df45..fadd9e4631 100644
 --- a/po/ca.po
 +++ b/po/ca.po
-@@ -7381,7 +7381,7 @@ msgid ""
+@@ -18605,7 +18605,7 @@ msgid ""
  "\n"
  "\tgit config --global init.defaultBranch <name>\n"
  "\n"
@@ -24,24 +33,20 @@ index 524330a..4b31f5d 100644
  "'development'. The just-created branch can be renamed via this command:\n"
  "\n"
  "\tgit branch -m <name>\n"
-diff --git a/po/de.po b/po/de.po
-index ef04b54..9f258e5 100644
---- a/po/de.po
-+++ b/po/de.po
-@@ -7374,7 +7374,7 @@ msgid ""
+@@ -18618,7 +18618,7 @@ msgstr ""
  "\n"
- "\tgit config --global init.defaultBranch <name>\n"
+ "\tgit config --global init.defaultBranch <nom>\n"
  "\n"
--"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
-+"Names commonly chosen instead of 'mistress' are 'main', 'trunk' and\n"
- "'development'. The just-created branch can be renamed via this command:\n"
+-"Els noms més usats habitualment en lloc de «master» són «main», «trunk» i\n"
++"Els noms més usats habitualment en lloc de «mistress» són «main», «trunk» i\n"
+ "«development». La branca acabada de crear es pot canviar de nom amb "
+ "l'ordre:\n"
  "\n"
- "\tgit branch -m <name>\n"
-diff --git a/po/es.po b/po/es.po
-index ced2eb6..a6debdc 100644
---- a/po/es.po
-+++ b/po/es.po
-@@ -7121,7 +7121,7 @@ msgid ""
+diff --git a/po/de.po b/po/de.po
+index 76d6d3bea7..744b78fa89 100644
+--- a/po/de.po
++++ b/po/de.po
+@@ -18727,7 +18727,7 @@ msgid ""
  "\n"
  "\tgit config --global init.defaultBranch <name>\n"
  "\n"
@@ -50,24 +55,20 @@ index ced2eb6..a6debdc 100644
  "'development'. The just-created branch can be renamed via this command:\n"
  "\n"
  "\tgit branch -m <name>\n"
-diff --git a/po/fr.po b/po/fr.po
-index 7f3ace8..42badfd 100644
---- a/po/fr.po
-+++ b/po/fr.po
-@@ -7432,7 +7432,7 @@ msgid ""
+@@ -18739,7 +18739,7 @@ msgstr ""
  "\n"
- "\tgit config --global init.defaultBranch <name>\n"
+ "\tgit config --global init.defaultBranch <Name>\n"
  "\n"
--"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
-+"Names commonly chosen instead of 'mistress' are 'main', 'trunk' and\n"
- "'development'. The just-created branch can be renamed via this command:\n"
+-"Häufig gewählte Namen statt 'master' sind 'main', 'trunk' und\n"
++"Häufig gewählte Namen statt 'mistress' sind 'main', 'trunk' und\n"
+ "'development'. Der gerade erstellte Branch kann mit diesem Befehl\n"
+ "umbenannt werden:\n"
  "\n"
- "\tgit branch -m <name>\n"
-diff --git a/po/git.pot b/po/git.pot
-index 054cb99..84bd458 100644
---- a/po/git.pot
-+++ b/po/git.pot
-@@ -6744,7 +6744,7 @@ msgid ""
+diff --git a/po/es.po b/po/es.po
+index b219047679..dbd89eee2a 100644
+--- a/po/es.po
++++ b/po/es.po
+@@ -18404,7 +18404,7 @@ msgid ""
  "\n"
  "\tgit config --global init.defaultBranch <name>\n"
  "\n"
@@ -76,21 +77,17 @@ index 054cb99..84bd458 100644
  "'development'. The just-created branch can be renamed via this command:\n"
  "\n"
  "\tgit branch -m <name>\n"
-diff --git a/po/id.po b/po/id.po
-index 76284fe..b5fa59d 100644
---- a/po/id.po
-+++ b/po/id.po
-@@ -7122,7 +7122,7 @@ msgid ""
+@@ -18417,7 +18417,7 @@ msgstr ""
  "\n"
- "\tgit config --global init.defaultBranch <name>\n"
+ "\tgit config --global init.defaultBranch <nombre>\n"
  "\n"
--"Names commonly chosen instead of 'master' are 'main', 'trunk' and\n"
-+"Names commonly chosen instead of 'mistress' are 'main', 'trunk' and\n"
- "'development'. The just-created branch can be renamed via this command:\n"
+-"Los nombres comúnmente elegidos en lugar de 'master' son 'main', 'trunk' y\n"
++"Los nombres comúnmente elegidos en lugar de 'mistress' son 'main', 'trunk' y\n"
+ "'development'. Se puede cambiar el nombre de la rama recién creada mediante "
+ "este comando:\n"
  "\n"
- "\tgit branch -m <name>\n"
 diff --git a/po/pl.po b/po/pl.po
-index 0ec127e..81d9c8c 100644
+index 0ec127e14c..49c71bacee 100644
 --- a/po/pl.po
 +++ b/po/pl.po
 @@ -7136,7 +7136,7 @@ msgid ""
@@ -102,8 +99,17 @@ index 0ec127e..81d9c8c 100644
  "'development'. The just-created branch can be renamed via this command:\n"
  "\n"
  "\tgit branch -m <name>\n"
+@@ -7147,7 +7147,7 @@ msgstr ""
+ "\n"
+ "\tgit config --global init.defaultBranch <nazwa>\n"
+ "\n"
+-"Tradycyjnie było „master”, a inne popularne to „main”, „trunk”\n"
++"Tradycyjnie było „mistress”, a inne popularne to „main”, „trunk”\n"
+ "i „development”. Nazwę właśnie utworzonej gałęzi można zmienić tym "
+ "poleceniem:\n"
+ "\n"
 diff --git a/po/pt_PT.po b/po/pt_PT.po
-index 3214253..c47201b 100644
+index 32142531bb..c47201b512 100644
 --- a/po/pt_PT.po
 +++ b/po/pt_PT.po
 @@ -7323,7 +7323,7 @@ msgid ""
@@ -116,10 +122,10 @@ index 3214253..c47201b 100644
  "\n"
  "\tgit branch -m <name>\n"
 diff --git a/po/ru.po b/po/ru.po
-index 993d106..a0e77b4 100644
+index 803208c4d5..7e3dc44ae0 100644
 --- a/po/ru.po
 +++ b/po/ru.po
-@@ -5798,7 +5798,7 @@ msgid ""
+@@ -17834,7 +17834,7 @@ msgid ""
  "\n"
  "\tgit config --global init.defaultBranch <name>\n"
  "\n"
@@ -129,10 +135,10 @@ index 993d106..a0e77b4 100644
  "\n"
  "\tgit branch -m <name>\n"
 diff --git a/po/sv.po b/po/sv.po
-index 14176ac..b226a5e 100644
+index 56db2f1bb1..14e3e75d04 100644
 --- a/po/sv.po
 +++ b/po/sv.po
-@@ -7230,7 +7230,7 @@ msgid ""
+@@ -18162,7 +18162,7 @@ msgid ""
  "\n"
  "\tgit config --global init.defaultBranch <name>\n"
  "\n"
@@ -141,11 +147,20 @@ index 14176ac..b226a5e 100644
  "'development'. The just-created branch can be renamed via this command:\n"
  "\n"
  "\tgit branch -m <name>\n"
+@@ -18173,7 +18173,7 @@ msgstr ""
+ "\n"
+ "\tgit config --global init.defaultBranch <namn>\n"
+ "\n"
+-"Namn som ofta används istället för \"master\" är \"main\", \"trunk\" och\n"
++"Namn som ofta används istället för \"mistress\" är \"main\", \"trunk\" och\n"
+ "\"development\". Den nyskapade grenen kan ges nytt namn med kommandot:\n"
+ "\n"
+ "\tgit branch -m <namn>\n"
 diff --git a/po/tr.po b/po/tr.po
-index 45d66c6..516193f 100644
+index 1e1d0318fd..c53d3eb968 100644
 --- a/po/tr.po
 +++ b/po/tr.po
-@@ -7295,7 +7295,7 @@ msgid ""
+@@ -18258,7 +18258,7 @@ msgid ""
  "\n"
  "\tgit config --global init.defaultBranch <name>\n"
  "\n"
@@ -154,11 +169,20 @@ index 45d66c6..516193f 100644
  "'development'. The just-created branch can be renamed via this command:\n"
  "\n"
  "\tgit branch -m <name>\n"
+@@ -18269,7 +18269,7 @@ msgstr ""
+ "\n"
+ "\tgit config --global init.defaultBranch <ad>\n"
+ "\n"
+-"'master' yerine kullanılan diğer yaygın dal adları 'main', 'trunk'\n"
++"'mistress' yerine kullanılan diğer yaygın dal adları 'main', 'trunk'\n"
+ "ve/veya 'development'tır. Yeni oluşturulan dal şu komutla yeniden\n"
+ "adlandırılabilir:\n"
+ "\n"
 diff --git a/po/vi.po b/po/vi.po
-index 69c3b93..11db03c 100644
+index d673745ac5..9b4fe3f959 100644
 --- a/po/vi.po
 +++ b/po/vi.po
-@@ -7242,7 +7242,7 @@ msgid ""
+@@ -18314,7 +18314,7 @@ msgid ""
  "\n"
  "\tgit config --global init.defaultBranch <name>\n"
  "\n"
@@ -167,11 +191,20 @@ index 69c3b93..11db03c 100644
  "'development'. The just-created branch can be renamed via this command:\n"
  "\n"
  "\tgit branch -m <name>\n"
+@@ -18325,7 +18325,7 @@ msgstr ""
+ "\n"
+ "\tgit config --global init.defaultBranch <tên>\n"
+ "\n"
+-"Tên thường được chọn thay cho “master” là “main”, “trunk” và\n"
++"Tên thường được chọn thay cho “mistress” là “main”, “trunk” và\n"
+ "“development”. Nhánh vừa tạo có thể được đổi tên thông qua lệnh:\n"
+ "\n"
+ "\tgit branch -m <tên>\n"
 diff --git a/po/zh_CN.po b/po/zh_CN.po
-index f0551f2..271e645 100644
+index 7de9c72d56..d50efba586 100644
 --- a/po/zh_CN.po
 +++ b/po/zh_CN.po
-@@ -7197,7 +7197,7 @@ msgid ""
+@@ -22523,7 +22523,7 @@ msgid ""
  "\n"
  "\tgit config --global init.defaultBranch <name>\n"
  "\n"
@@ -180,11 +213,20 @@ index f0551f2..271e645 100644
  "'development'. The just-created branch can be renamed via this command:\n"
  "\n"
  "\tgit branch -m <name>\n"
+@@ -22533,7 +22533,7 @@ msgstr ""
+ "\n"
+ "\tgit config --global init.defaultBranch <名称>\n"
+ "\n"
+-"除了 'master' 之外，通常选定的名字有 'main'、'trunk' 和 'development'。\n"
++"除了 'mistress' 之外，通常选定的名字有 'main'、'trunk' 和 'development'。\n"
+ "可以通过以下命令重命名刚创建的分支：\n"
+ "\n"
+ "\tgit branch -m <name>\n"
 diff --git a/po/zh_TW.po b/po/zh_TW.po
-index caf6057..a81fd01 100644
+index 2f7d01c303..261ea6df20 100644
 --- a/po/zh_TW.po
 +++ b/po/zh_TW.po
-@@ -7057,7 +7057,7 @@ msgid ""
+@@ -22370,7 +22370,7 @@ msgid ""
  "\n"
  "\tgit config --global init.defaultBranch <name>\n"
  "\n"
@@ -193,8 +235,17 @@ index caf6057..a81fd01 100644
  "'development'. The just-created branch can be renamed via this command:\n"
  "\n"
  "\tgit branch -m <name>\n"
+@@ -22381,7 +22381,7 @@ msgstr ""
+ "\n"
+ "\tgit config --global init.defaultBranch <name>\n"
+ "\n"
+-"除了 “master” 外，常用的分支名稱有 “main”, “trunk” 以及\n"
++"除了 “mistress” 外，常用的分支名稱有 “main”, “trunk” 以及\n"
+ "“development”。剛建立的分支可以用這個命令重新命名：\n"
+ "\n"
+ "\tgit branch -m <name>\n"
 diff --git a/refs.c b/refs.c
-index 9db66e9..027a45d 100644
+index 90bcb27168..0ab5e4fde9 100644
 --- a/refs.c
 +++ b/refs.c
 @@ -564,7 +564,7 @@ static const char default_branch_name_advice[] = N_(
@@ -206,17 +257,12 @@ index 9db66e9..027a45d 100644
  "'development'. The just-created branch can be renamed via this command:\n"
  "\n"
  "\tgit branch -m <name>\n"
-@@ -583,9 +583,10 @@ char *repo_default_branch_name(struct repository *r, int quiet)
+@@ -583,7 +583,7 @@ char *repo_default_branch_name(struct repository *r, int quiet)
  		die(_("could not retrieve `%s`"), config_display_key);
  
  	if (!ret) {
 -		ret = xstrdup("master");
--		if (!quiet)
--			advise(_(default_branch_name_advice), ret);
 +		ret = xstrdup("mistress");
-+		// there's no need to advise this - the point is we're setting it manually
-+		//if (!quiet)
-+			//advise(_(default_branch_name_advice), ret);
- 	}
- 
- 	full_ref = xstrfmt("refs/heads/%s", ret);
+		if (!quiet)
+			advise(_(default_branch_name_advice), ret);
+	}