tree 84ed769e256ef366e0f003c93530a39051de10b3
parent 93d08928910200969c486328e576057aada6f9dc
parent cf82bff73f11d3197aa6b667002ea86da1dfa835
author Junio C Hamano <gitster@pobox.com> 1584482541 -0700
committer Junio C Hamano <gitster@pobox.com> 1584482541 -0700

Merge branch 'jk/clang-sanitizer-fixes' into maint

C pedantry ;-) fix.

* jk/clang-sanitizer-fixes:
  obstack: avoid computing offsets from NULL pointer
  xdiff: avoid computing non-zero offset from NULL pointer
  avoid computing zero offsets from NULL pointer
  merge-recursive: use subtraction to flip stage
  merge-recursive: silence -Wxor-used-as-pow warning