From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 May 2017 03:34:45 +0000 (+0900)
Subject: Merge branch 'jk/bug-to-abort'
X-Git-Tag: v2.14.0-rc0~161
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=220c6a70803d520a7cd19f9f2889650d54574470;p=thirdparty%2Fgit.git

Merge branch 'jk/bug-to-abort'

Introduce the BUG() macro to improve die("BUG: ...").

* jk/bug-to-abort:
  usage: add NORETURN to BUG() function definitions
  config: complain about --local outside of a git repo
  setup_git_env: convert die("BUG") to BUG()
  usage.c: add BUG() function
---

220c6a70803d520a7cd19f9f2889650d54574470