From: Jiang Xin <worldhello.net@gmail.com>
Date: Fri, 13 Aug 2021 23:56:22 +0000 (+0800)
Subject: Merge branch 'master' of github.com:git/git
X-Git-Tag: v2.33.0~2^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=117e2caa42210de5c2c1ecfdf5d2bda056cd6f00;p=thirdparty%2Fgit.git

Merge branch 'master' of github.com:git/git

* 'master' of github.com:git/git: (51 commits)
  Git 2.33-rc2
  object-file: use unsigned arithmetic with bit mask
  Revert 'diff-merges: let "-m" imply "-p"'
  object-store: avoid extra ';' from KHASH_INIT
  oidtree: avoid nested struct oidtree_node
  Git 2.33-rc1
  test: fix for COLUMNS and bash 5
  The eighth batch
  diff: --pickaxe-all typofix
  mingw: align symlinks-related rmdir() behavior with Linux
  t7508: avoid non POSIX BRE
  use fspathhash() everywhere
  t0001: fix broken not-quite getcwd(3) test in bed67874e2
  Documentation: render special characters correctly
  reset: clear_unpack_trees_porcelain to plug leak
  builtin/rebase: fix options.strategy memory lifecycle
  builtin/merge: free found_ref when done
  builtin/mv: free or UNLEAK multiple pointers at end of cmd_mv
  convert: release strbuf to avoid leak
  read-cache: call diff_setup_done to avoid leak
  ...
---

117e2caa42210de5c2c1ecfdf5d2bda056cd6f00