From: Nguyễn Thái Ngọc Duy Date: Fri, 26 Nov 2010 18:17:43 GMT Subject: [PATCH 1/5] cache.h: remove surrounding brackes and realign CE_* constants Message-ID: <1290795467-7570-2-git-send-email-pclouds@gmail.com> In-Reply-To: <1290795467-7570-1-git-send-email-pclouds@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy --- cache.h | 25 ++++++++++++------------- 1 files changed, 12 insertions(+), 13 deletions(-) diff --git a/cache.h b/cache.h index 33decd9..4819cf5 100644 --- a/cache.h +++ b/cache.h @@ -170,26 +170,25 @@ struct cache_entry { * * In-memory only flags */ -#define CE_UPDATE (0x10000) -#define CE_REMOVE (0x20000) -#define CE_UPTODATE (0x40000) -#define CE_ADDED (0x80000) +#define CE_UPDATE 0x10000 +#define CE_REMOVE 0x20000 +#define CE_UPTODATE 0x40000 +#define CE_ADDED 0x80000 -#define CE_HASHED (0x100000) -#define CE_UNHASHED (0x200000) -#define CE_CONFLICTED (0x800000) +#define CE_HASHED 0x100000 +#define CE_UNHASHED 0x200000 +#define CE_WT_REMOVE 0x400000 /* remove in work directory */ +#define CE_CONFLICTED 0x800000 -#define CE_WT_REMOVE (0x400000) /* remove in work directory */ - -#define CE_UNPACKED (0x1000000) +#define CE_UNPACKED 0x1000000 /* * Extended on-disk flags */ -#define CE_INTENT_TO_ADD 0x20000000 -#define CE_SKIP_WORKTREE 0x40000000 +#define CE_INTENT_TO_ADD 0x20000000 +#define CE_SKIP_WORKTREE 0x40000000 /* CE_EXTENDED2 is for future extension */ -#define CE_EXTENDED2 0x80000000 +#define CE_EXTENDED2 0x80000000 #define CE_EXTENDED_FLAGS (CE_INTENT_TO_ADD | CE_SKIP_WORKTREE) -- 1.7.3.2.316.gda8b3