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

Git: Fix sha1 resolving when a branch is added from detached HEAD

Browse Source 
Change-Id: I0d8ad988411256fc284b84f78be6f54362ab19ea
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2014-06-23 16:55:18 +03:00
committed by Orgad Shaneh
parent 8fc7035b18
commit aaa7cd5851
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/git/branchmodel.cpp
View File

@@ -574,14 +574,19 @@ QModelIndex BranchModel::addBranch(const QString &name, bool track, const QModel
const QString trackedBranch = fullName(startPoint); const QString trackedBranch = fullName(startPoint);
const QString fullTrackedBranch = fullName(startPoint, true); const QString fullTrackedBranch = fullName(startPoint, true);
QString startSha;
QString output; QString output;
QString errorMessage; QString errorMessage;
QStringList args; QStringList args;
args << (track ? QLatin1String("--track") : QLatin1String("--no-track")); args << (track ? QLatin1String("--track") : QLatin1String("--no-track"));
args << name; args << name;
if (!fullTrackedBranch.isEmpty()) if (!fullTrackedBranch.isEmpty()) {
args << fullTrackedBranch; args << fullTrackedBranch;
startSha = sha(startPoint);
} else {
startSha = m_client->synchronousTopRevision(m_workingDirectory);
}
if (!m_client->synchronousBranchCmd(m_workingDirectory, args, &output, &errorMessage)) { if (!m_client->synchronousBranchCmd(m_workingDirectory, args, &output, &errorMessage)) {
VcsBase::VcsBaseOutputWindow::instance()->appendError(errorMessage); VcsBase::VcsBaseOutputWindow::instance()->appendError(errorMessage);
@@ -606,7 +611,7 @@ QModelIndex BranchModel::addBranch(const QString &name, bool track, const QModel
local = child; local = child;
} }
int pos = positionForName(local, leafName); int pos = positionForName(local, leafName);
BranchNode *newNode = new BranchNode(leafName, sha(startPoint), track ? trackedBranch : QString()); BranchNode *newNode = new BranchNode(leafName, startSha, track ? trackedBranch : QString());
if (!added) if (!added)
beginInsertRows(nodeToIndex(local), pos, pos); beginInsertRows(nodeToIndex(local), pos, pos);
newNode->parent = local; newNode->parent = local;