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

Git: Show original branch name while rebasing

Browse Source 
Change-Id: I104afed7d2d5f37d391b7690f81fbad07363907c
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-06-14 23:19:01 +03:00
committed by Orgad Shaneh
parent 905e5ea847
commit c621768b29
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/git/gitclient.cpp
View File

@@ -1324,9 +1324,18 @@ QString GitClient::synchronousCurrentLocalBranch(const QString &workingDirectory
{ {
QByteArray outputTextData; QByteArray outputTextData;
QStringList arguments; QStringList arguments;
QString branch;
arguments << QLatin1String("symbolic-ref") << QLatin1String(HEAD); arguments << QLatin1String("symbolic-ref") << QLatin1String(HEAD);
if (vcsFullySynchronousExec(workingDirectory, arguments, &outputTextData, 0, silentFlags)) { if (vcsFullySynchronousExec(workingDirectory, arguments, &outputTextData, 0, silentFlags)) {
QString branch = commandOutputFromLocal8Bit(outputTextData.trimmed()); branch = commandOutputFromLocal8Bit(outputTextData.trimmed());
} else {
const QString gitDir = findGitDirForRepository(workingDirectory);
const QString rebaseHead = gitDir + QLatin1String("/rebase-merge/head-name");
QFile head(rebaseHead);
if (head.open(QFile::ReadOnly))
branch = QString::fromUtf8(head.readLine()).trimmed();
}
if (!branch.isEmpty()) {
const QString refsHeadsPrefix = QLatin1String("refs/heads/"); const QString refsHeadsPrefix = QLatin1String("refs/heads/");
if (branch.startsWith(refsHeadsPrefix)) { if (branch.startsWith(refsHeadsPrefix)) {
branch.remove(0, refsHeadsPrefix.count()); branch.remove(0, refsHeadsPrefix.count());