From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Jun 2014 18:21:36 +0000 (-0700)
Subject: Merge branch 'jk/squelch-compiler-warning-from-funny-error-macro'
X-Git-Tag: v2.1.0-rc0~171
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=610a14f643b1dfe188e938492425cc88d96025a8;p=thirdparty%2Fgit.git

Merge branch 'jk/squelch-compiler-warning-from-funny-error-macro'

* jk/squelch-compiler-warning-from-funny-error-macro:
  let clang use the constant-return error() macro
  inline constant return from error() function
---

610a14f643b1dfe188e938492425cc88d96025a8