feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Make file state resolving more accurate

Browse Source 
Change-Id: I238ef964df126a341c87dacf9344ff1570f31845
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-02-10 22:22:40 +02:00
committed by Orgad Shaneh
parent ae58073080
commit 2c68c80196
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/git/commitdata.h
View File

@@ -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)