summaryrefslogtreecommitdiff
path: root/src/plugins/git/commitdata.h
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2013-02-10 22:22:40 +0200
committerOrgad Shaneh <orgads@gmail.com>2013-02-11 11:10:11 +0100
commit2c68c801969c1cf713d9bef8925d6c2580d8730f (patch)
tree3ee8bcfdb01b027974b051aca7e215a9120b2893 /src/plugins/git/commitdata.h
parentae58073080c2bebef359e84e25a5d0beef32fddf (diff)
downloadqt-creator-2c68c801969c1cf713d9bef8925d6c2580d8730f.tar.gz
Git: Make file state resolving more accurate
Change-Id: I238ef964df126a341c87dacf9344ff1570f31845 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/git/commitdata.h')
-rw-r--r--src/plugins/git/commitdata.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/git/commitdata.h b/src/plugins/git/commitdata.h
index 40faabe4fa..746d5d259a 100644
--- a/src/plugins/git/commitdata.h
+++ b/src/plugins/git/commitdata.h
@@ -64,7 +64,7 @@ struct GitSubmitEditorPanelData
QDebug operator<<(QDebug d, const GitSubmitEditorPanelData &);
enum FileState {
- UntrackedFile = 0,
+ EmptyFileState = 0x00,
StagedFile = 0x01,
ModifiedFile = 0x02,
@@ -77,6 +77,7 @@ enum FileState {
UnmergedUs = 0x100,
UnmergedThem = 0x200,
+ UntrackedFile = 0x400,
UnknownFileState = 0x800
};
Q_DECLARE_FLAGS(FileStates, FileState)