From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Mar 2020 22:02:21 +0000 (-0700)
Subject: Merge branch 'jk/clang-sanitizer-fixes' into maint
X-Git-Tag: v2.25.2~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a7a2e12b6eb97126f9d07298f281eb1c91730750;p=thirdparty%2Fgit.git

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
---

a7a2e12b6eb97126f9d07298f281eb1c91730750