undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/bisect-show-list-fix'

Browse Source 
Debugging aid update.

* nd/bisect-show-list-fix:
  bisect.c: make show_list() build again
This commit is contained in:
Junio C Hamano 2018-09-17 13:54:00 -07:00
commit 1966cda6f4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bisect.c
View File

@ -14,6 +14,7 @@
#include "argv-array.h" #include "argv-array.h"
#include "commit-slab.h" #include "commit-slab.h"
#include "commit-reach.h" #include "commit-reach.h"
#include "object-store.h"
static struct oid_array good_revs; static struct oid_array good_revs;
static struct oid_array skipped_revs; static struct oid_array skipped_revs;
@ -121,14 +122,14 @@ static inline int halfway(struct commit_list *p, int nr)
} }
} }
#if !DEBUG_BISECT
#define show_list(a,b,c,d) do { ; } while (0)
#else
static void show_list(const char *debug, int counted, int nr, static void show_list(const char *debug, int counted, int nr,
struct commit_list *list) struct commit_list *list)
{ {
struct commit_list *p; struct commit_list *p;
if (!DEBUG_BISECT)
return;
fprintf(stderr, "%s (%d/%d)\n", debug, counted, nr); fprintf(stderr, "%s (%d/%d)\n", debug, counted, nr);
for (p = list; p; p = p->next) { for (p = list; p; p = p->next) {
@ -146,7 +147,7 @@ static void show_list(const char *debug, int counted, int nr,
(flags & TREESAME) ? ' ' : 'T', (flags & TREESAME) ? ' ' : 'T',
(flags & UNINTERESTING) ? 'U' : ' ', (flags & UNINTERESTING) ? 'U' : ' ',
(flags & COUNTED) ? 'C' : ' '); (flags & COUNTED) ? 'C' : ' ');
if (commit->util) if (*commit_weight_at(&commit_weight, p->item))
fprintf(stderr, "%3d", weight(p)); fprintf(stderr, "%3d", weight(p));
else else
fprintf(stderr, "---"); fprintf(stderr, "---");
@ -161,7 +162,6 @@ static void show_list(const char *debug, int counted, int nr,
fprintf(stderr, "\n"); fprintf(stderr, "\n");
} }
} }
#endif /* DEBUG_BISECT */
static struct commit_list *best_bisection(struct commit_list *list, int nr) static struct commit_list *best_bisection(struct commit_list *list, int nr)
{ {