Merge branch 'jk/bug-to-abort'
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 May 2017 03:34:45 +0000 (12:34 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 May 2017 03:34:45 +0000 (12:34 +0900)
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

1  2 
environment.c
git-compat-util.h
diff --cc environment.c
Simple merge
Simple merge