diff options
| author | Jeff Hostetler <jeffhost@microsoft.com> | 2019-06-20 00:05:58 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-21 00:03:05 +0300 |
| commit | e9b9cc56bbc0a223798c731798da1bee9f599cab (patch) | |
| tree | 85a92fa32c834b4c371c5f2c1badb9e5a6cf26eb /builtin/blame.c | |
| parent | fdda1ac62d7b2adba3d443ab8051a6accfe160df (diff) | |
cache-tree/blame: avoid reusing the DEBUG constant
In MS Visual C, the `DEBUG` constant is set automatically whenever
compiling with debug information.
This is clearly not what was intended in `cache-tree.c` nor in
`builtin/blame.c`, so let's use a less ambiguous name there.
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/blame.c')
| -rw-r--r-- | builtin/blame.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/blame.c b/builtin/blame.c index 21cde57e711..50e3d4a2656 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -59,8 +59,8 @@ static size_t blame_date_width; static struct string_list mailmap = STRING_LIST_INIT_NODUP; -#ifndef DEBUG -#define DEBUG 0 +#ifndef DEBUG_BLAME +#define DEBUG_BLAME 0 #endif static unsigned blame_move_score; @@ -1062,7 +1062,7 @@ parse_done: if (blame_copy_score) sb.copy_score = blame_copy_score; - sb.debug = DEBUG; + sb.debug = DEBUG_BLAME; sb.on_sanity_fail = &sanity_check_on_fail; sb.show_root = show_root; |