Merge branch 'hv/bitshift-constants-in-blame'

Move the definition of a set of bitmask constants from 0ctal
literal to (1U<<count) notation.

* hv/bitshift-constants-in-blame:
  builtin/blame.c: constants into bit shift format
This commit is contained in:
Junio C Hamano 2019-11-10 18:02:12 +09:00
commit 8f40d89783

View file

@ -319,18 +319,18 @@ static const char *format_time(timestamp_t time, const char *tz_str,
return time_buf.buf; return time_buf.buf;
} }
#define OUTPUT_ANNOTATE_COMPAT 001 #define OUTPUT_ANNOTATE_COMPAT (1U<<0)
#define OUTPUT_LONG_OBJECT_NAME 002 #define OUTPUT_LONG_OBJECT_NAME (1U<<1)
#define OUTPUT_RAW_TIMESTAMP 004 #define OUTPUT_RAW_TIMESTAMP (1U<<2)
#define OUTPUT_PORCELAIN 010 #define OUTPUT_PORCELAIN (1U<<3)
#define OUTPUT_SHOW_NAME 020 #define OUTPUT_SHOW_NAME (1U<<4)
#define OUTPUT_SHOW_NUMBER 040 #define OUTPUT_SHOW_NUMBER (1U<<5)
#define OUTPUT_SHOW_SCORE 0100 #define OUTPUT_SHOW_SCORE (1U<<6)
#define OUTPUT_NO_AUTHOR 0200 #define OUTPUT_NO_AUTHOR (1U<<7)
#define OUTPUT_SHOW_EMAIL 0400 #define OUTPUT_SHOW_EMAIL (1U<<8)
#define OUTPUT_LINE_PORCELAIN 01000 #define OUTPUT_LINE_PORCELAIN (1U<<9)
#define OUTPUT_COLOR_LINE 02000 #define OUTPUT_COLOR_LINE (1U<<10)
#define OUTPUT_SHOW_AGE_WITH_COLOR 04000 #define OUTPUT_SHOW_AGE_WITH_COLOR (1U<<11)
static void emit_porcelain_details(struct blame_origin *suspect, int repeat) static void emit_porcelain_details(struct blame_origin *suspect, int repeat)
{ {