From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 11 Mar 2023 20:18:55 +0000 (+0100)
Subject: Sync with 2.36.6
X-Git-Tag: v2.37.7~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1df551ce5c110d08775032f4ab6f8f89a40edb88;p=thirdparty%2Fgit.git

Sync with 2.36.6

* maint-2.36: (30 commits)
  Git 2.36.6
  Git 2.35.8
  Git 2.34.8
  Git 2.33.8
  Git 2.32.7
  Git 2.31.8
  tests: avoid using `test_i18ncmp`
  Git 2.30.9
  gettext: avoid using gettext if the locale dir is not present
  apply --reject: overwrite existing `.rej` symlink if it exists
  http.c: clear the 'finished' member once we are done with it
  clone.c: avoid "exceeds maximum object size" error with GCC v12.x
  range-diff: use ssize_t for parsed "len" in read_patches()
  range-diff: handle unterminated lines in read_patches()
  range-diff: drop useless "offset" variable from read_patches()
  t5604: GETTEXT_POISON fix, conclusion
  t5604: GETTEXT_POISON fix, part 1
  t5619: GETTEXT_POISON fix
  t0003: GETTEXT_POISON fix, conclusion
  t0003: GETTEXT_POISON fix, part 1
  t0033: GETTEXT_POISON fix
  ...
---

1df551ce5c110d08775032f4ab6f8f89a40edb88
diff --cc config.c
index 9b0e9c9328,ab980722a0..96e80498aa
--- a/config.c
+++ b/config.c
@@@ -3569,10 -3577,10 +3582,10 @@@ static int git_config_copy_or_rename_se
  				strbuf_reset(&copystr);
  			}
  
- 			offset = section_name_match(&buf[i], old_name);
+ 			offset = section_name_match(&buf.buf[i], old_name);
  			if (offset > 0) {
  				ret++;
 -				if (new_name == NULL) {
 +				if (!new_name) {
  					remove = 1;
  					continue;
  				}