diff options
| author | Patrick Steinhardt <ps@pks.im> | 2024-12-06 11:27:19 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-12-06 12:20:02 +0100 |
| commit | 41f43b8243f42b9df2e98be8460646d4c0100ad3 (patch) | |
| tree | 27a0fe0c493a3e08af4d502aaad6be01fac69118 /builtin/merge.c | |
| parent | compat/win32: fix -Wsign-compare warning in "wWinMain()" (diff) | |
| download | git-41f43b8243f42b9df2e98be8460646d4c0100ad3.tar.xz git-41f43b8243f42b9df2e98be8460646d4c0100ad3.zip | |
global: mark code units that generate warnings with `-Wsign-compare`
Mark code units that generate warnings with `-Wsign-compare`. This
allows for a structured approach to get rid of all such warnings over
time in a way that can be easily measured.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 51038eaca8..a2712a0bab 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -5,7 +5,10 @@ * * Based on git-merge.sh by Junio C Hamano. */ + #define USE_THE_REPOSITORY_VARIABLE +#define DISABLE_SIGN_COMPARE_WARNINGS + #include "builtin.h" #include "abspath.h" |