diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-10 01:25:45 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-10 01:25:45 +0300 |
| commit | 88b10757593ab47354a3c9d191d7c03d584a40cf (patch) | |
| tree | 363afdfa16b666e9d81cd254a9466e9a2e571cfc /builtin | |
| parent | 6624e07b36c97e04ba68c8310a70bc69433e187e (diff) | |
| parent | 54b6110a9b2e11847e62d36f64ef80fd38009772 (diff) | |
Merge branch 'jh/msvc'
Support to build with MSVC has been updated.
* jh/msvc:
msvc: ignore .dll and incremental compile output
msvc: avoid debug assertion windows in Debug Mode
msvc: do not pretend to support all signals
msvc: add pragmas for common warnings
msvc: add a compile-time flag to allow detailed heap debugging
msvc: support building Git using MS Visual C++
msvc: update Makefile to allow for spaces in the compiler path
msvc: fix detect_msys_tty()
msvc: define ftello()
msvc: do not re-declare the timespec struct
msvc: mark a variable as non-const
msvc: define O_ACCMODE
msvc: include sigset_t definition
msvc: fix dependencies of compat/msvc.c
mingw: replace mingw_startup() hack
obstack: fix compiler warning
cache-tree/blame: avoid reusing the DEBUG constant
t0001 (mingw): do not expect a specific order of stdout/stderr
Mark .bat files as requiring CR/LF endings
mingw: fix a typo in the msysGit-specific section
Diffstat (limited to 'builtin')
| -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 21cde57e71..50e3d4a265 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; |