[PATCH 1/1] Remove aliasing between COUNTED and UNINTERESTING flags used by rev-list.c
From: Jon Seymour <hidden>
Date: 2016-06-15 22:42:01
Subsystem:
the rest · Maintainer:
Linus Torvalds
The COUNTED and UNINTERESTING flags were unintentionally aliased. This patch makes sure that flags defined in rev-list.c have distinct values from from those defined by epoch.h. The aliasing may have caused unexpected behaviour of the git-rev-list --bisect flag. Signed-off-by: Jon Seymour <redacted> --- rev-list.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) fb2676c0c3991666db9a3b0ebe222d8028c12a05
diff --git a/rev-list.c b/rev-list.c
--- a/rev-list.c
+++ b/rev-list.c@@ -4,10 +4,10 @@ #include "blob.h" #include "epoch.h" -#define SEEN (1u << 0) -#define INTERESTING (1u << 1) -#define COUNTED (1u << 2) -#define SHOWN (LAST_EPOCH_FLAG << 2) +#define SEEN (LAST_EPOCH_FLAG << 1) +#define INTERESTING (LAST_EPOCH_FLAG << 2) +#define COUNTED (LAST_EPOCH_FLAG << 3) +#define SHOWN (LAST_EPOCH_FLAG << 4) static const char rev_list_usage[] = "usage: git-rev-list [OPTION] commit-id <commit-id>\n" ------------