From 82c7aac17d59b10bc6e4bf0c3ed9e0b6376a052a Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgads@gmail.com>
Date: Mon, 12 Dec 2011 22:13:46 +0200
Subject: [PATCH] Git: Flag conflict
Change-Id: I3518367afeeb27b4408f396daf3362ae76148846
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
---
src/plugins/git/commitdata.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/plugins/git/commitdata.h b/src/plugins/git/commitdata.h
index 1f43c985bc5..d6221b1d2e1 100644
--- a/src/plugins/git/commitdata.h
+++ b/src/plugins/git/commitdata.h
@@ -72,13 +72,13 @@ public:
enum FileState {
UntrackedFile = 0,
- StagedFile = 1,
- ModifiedFile = 2,
- AddedFile = 3,
- DeletedFile = 4,
- RenamedFile = 8,
- CopiedFile = 16,
- UpdatedFile = 32,
+ StagedFile = 0x01,
+ ModifiedFile = 0x02,
+ AddedFile = 0x04,
+ DeletedFile = 0x08,
+ RenamedFile = 0x10,
+ CopiedFile = 0x20,
+ UpdatedFile = 0x40,
ModifiedStagedFile = StagedFile | ModifiedFile,
AddedStagedFile = StagedFile | AddedFile,
--
GitLab