From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 Feb 2020 20:41:36 +0000 (-0800)
Subject: Merge branch 'jk/clang-sanitizer-fixes'
X-Git-Tag: v2.26.0-rc0~83
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b7833910180d7d762ad0bb0f59cb02ba9ef86710;p=thirdparty%2Fgit.git

Merge branch 'jk/clang-sanitizer-fixes'

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

b7833910180d7d762ad0bb0f59cb02ba9ef86710