summaryrefslogtreecommitdiff
path: root/blame.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-10-30 19:38:50 -0800
committerJunio C Hamano <junkio@cox.net>2006-10-30 19:38:50 -0800
commit83877f8d92b2050eb668dc3351277e57779a8f05 (patch)
treedeedf7e97c113e09a4cb58f4ba25c0339b318279 /blame.c
parent6fb75bed5c4a6ce099a24e581ea327e9de3ab8b0 (diff)
parent9dad9d2e5b322835c87e1653268d892a95ee0f1f (diff)
downloadgit-83877f8d92b2050eb668dc3351277e57779a8f05.tar.gz
Merge branch 'maint'
* maint: revision traversal: --unpacked does not limit commit list anymore. Continue traversal when rev-list --unpacked finds a packed commit. Use memmove instead of memcpy for overlapping areas quote.c: ensure the same quoting across platforms. Surround "#define DEBUG 0" with "#ifndef DEBUG..#endif"
Diffstat (limited to 'blame.c')
-rw-r--r--blame.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/blame.c b/blame.c
index e664813cb4..3ec1c8f1b2 100644
--- a/blame.c
+++ b/blame.c
@@ -19,7 +19,9 @@
#include "xdiff-interface.h"
#include "quote.h"
+#ifndef DEBUG
#define DEBUG 0
+#endif
static const char blame_usage[] =
"git-blame [-c] [-l] [-t] [-f] [-n] [-p] [-S <revs-file>] [--] file [commit]\n"
@@ -232,6 +234,9 @@ static void print_map(struct commit *cmit, struct commit *other)
util2->num_lines ? util->num_lines : util2->num_lines;
int num;
+ if (print_map == NULL)
+ ; /* to avoid "unused function" warning */
+
for (i = 0; i < max; i++) {
printf("i: %d ", i);
num = -1;