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

Git: Support typechange

Browse Source 
Replacing a normal file with a symbolic link.

Change-Id: Id07ab339e8fcdf039b61d6e459b8d751d499f4f6
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2016-11-08 09:38:41 +02:00
committed by Orgad Shaneh
parent b98f2a3059
commit 877a10c8ef
5 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/git/commitdata.cpp
View File

@@ -94,6 +94,8 @@ static FileStates stateFor(const QChar &c)
return CopiedFile;
case 'U':
return UnmergedFile;
case 'T':
return TypeChangedFile;
case '?':
return UntrackedFile;
default:
@@ -209,6 +211,8 @@ QString CommitData::stateDisplayName(const FileStates &state)
resultState.append(tr("renamed"));
else if (state & CopiedFile)
resultState.append(tr("copied"));
else if (state & TypeChangedFile)
resultState.append(tr("typechange"));
if (state & UnmergedUs) {
if (state & UnmergedThem)
resultState.append(tr(" by both"));