diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2016-11-08 09:38:41 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2016-11-09 08:53:51 +0000 |
| commit | 877a10c8efb8be1daffe521ea1cfc16fc430a191 (patch) | |
| tree | 65d12fb0972703a114d7779536ec128d10774706 /src/plugins/git/commitdata.cpp | |
| parent | b98f2a3059293e67108ebf21d599d3ffde7fa83c (diff) | |
Git: Support typechange
Replacing a normal file with a symbolic link.
Change-Id: Id07ab339e8fcdf039b61d6e459b8d751d499f4f6
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/git/commitdata.cpp')
| -rw-r--r-- | src/plugins/git/commitdata.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/git/commitdata.cpp b/src/plugins/git/commitdata.cpp index 18adb570b3..d48aeb4906 100644 --- a/src/plugins/git/commitdata.cpp +++ b/src/plugins/git/commitdata.cpp @@ -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")); |