]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Sync with 2.36.6
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Sat, 11 Mar 2023 20:18:55 +0000 (21:18 +0100)
committerJohannes Schindelin <johannes.schindelin@gmx.de>
Mon, 17 Apr 2023 19:16:04 +0000 (21:16 +0200)
* 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
  ...

1  2 
.github/workflows/main.yml
Makefile
apply.c
ci/lib.sh
config.c
t/t1300-config.sh

Simple merge
diff --cc Makefile
Simple merge
diff --cc apply.c
Simple merge
diff --cc ci/lib.sh
Simple merge
diff --cc config.c
index 9b0e9c93285fb33a69ab3ee0b20ae95ad2e202e1,ab980722a019364c1744b1821e19d3b250b24ea5..96e80498aa1b65cae7d80f7ea6b7b0dcc4f9069a
+++ 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;
                                }
Simple merge