Merge branch 'jk/squelch-compiler-warning-from-funny-error-macro'
commit610a14f643b1dfe188e938492425cc88d96025a8
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Jun 2014 18:21:36 +0000 (6 11:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Jun 2014 18:21:36 +0000 (6 11:21 -0700)
tree419bdf6d93f09a4f3551652be0686ba609870f54
parentd2a274aa87d69786aa95da2f2eab88aa6b77644f
parentff0a80af724e81dbad6a269847523e39c2e7e479
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
cache.h
git-compat-util.h
parse-options.h