From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 Nov 2020 21:17:41 +0000 (-0800)
Subject: Merge branch 'jk/no-common'
X-Git-Tag: v2.30.0-rc0~130
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5277bd3e26991233199348c62c5bb7ff010f2e34;p=thirdparty%2Fgit.git

Merge branch 'jk/no-common'

Dev support to catch a tentative definition of a variable in our C
code as an error.

* jk/no-common:
  config.mak.dev: build with -fno-common
---

5277bd3e26991233199348c62c5bb7ff010f2e34
diff --cc config.mak.dev
index 89b218d11a,20168e5691..89fefacd94
--- a/config.mak.dev
+++ b/config.mak.dev
@@@ -15,7 -15,10 +15,8 @@@ DEVELOPER_CFLAGS += -Wpointer-arit
  DEVELOPER_CFLAGS += -Wstrict-prototypes
  DEVELOPER_CFLAGS += -Wunused
  DEVELOPER_CFLAGS += -Wvla
+ DEVELOPER_CFLAGS += -fno-common
  
 -DEVELOPER_CFLAGS += -DENABLE_SHA256
 -
  ifndef COMPILER_FEATURES
  COMPILER_FEATURES := $(shell ./detect-compiler $(CC))
  endif