diff options
| author | Orgad Shaneh <[email protected]> | 2013-08-26 22:31:01 +0300 |
|---|---|---|
| committer | Orgad Shaneh <[email protected]> | 2013-08-27 12:22:43 +0200 |
| commit | afcb9b2c416464188e3bd922b4407801f3413605 (patch) | |
| tree | 0681a5e8c3e3a00bd8f08d3a347d383d7d60f25d /src/plugins/git/gitversioncontrol.cpp | |
| parent | 969f9628dbae68757ec7f101ba7a9528eae9eca2 (diff) | |
Git: Show active branch next to command in progress
Revised topic is "master (MERGING)" instead of MERGING
This should also fix topic getting stuck as REBASING
Change-Id: I934643f5b4e632318495f141536c666f775bd15d
Reviewed-by: Tobias Hunger <[email protected]>
Diffstat (limited to 'src/plugins/git/gitversioncontrol.cpp')
| -rw-r--r-- | src/plugins/git/gitversioncontrol.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/git/gitversioncontrol.cpp b/src/plugins/git/gitversioncontrol.cpp index 845050d0cc1..b98e9ea3501 100644 --- a/src/plugins/git/gitversioncontrol.cpp +++ b/src/plugins/git/gitversioncontrol.cpp @@ -124,7 +124,11 @@ QString GitVersionControl::vcsGetRepositoryURL(const QString &directory) QString GitVersionControl::vcsTopic(const QString &directory) { - return m_client->synchronousTopic(directory); + QString topic = m_client->synchronousTopic(directory); + const QString commandInProgress = m_client->commandInProgressDescription(directory); + if (!commandInProgress.isEmpty()) + topic += QLatin1String(" (") + commandInProgress + QLatin1Char(')'); + return topic; } /* Snapshots are implemented using stashes, relying on stash messages for |