mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-04-24 21:48:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

dbhub: Fix creating new branches

Browse Source 
This fixes creating new branches or pushing to a different existing
branch than the currently checked out branch.
This commit is contained in:
Martin Kleusberg
2020-08-30 21:11:06 +02:00
parent 623eb11c4f
commit 8c12ee01ae
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/RemoteDock.cpp
+6 -2
View File
@@ -383,10 +383,14 @@ void RemoteDock::pushDatabase(const QString& path, const QString& branch)
url.append("/");
url.append(pushDialog.name());
// Check if we are pushing a cloned database. Only in this case we provide the last known commit id
// Check if we are pushing a cloned database. Only in this case we provide the last known commit id.
// For this check we use the branch name which was used for cloning this database rather than the
// branch name which was selected in the push dialog. This is because we want to figure out the
// current commit id of we are currently looking at rather than some other commit id or none at all
// when creating a new branch.
QString commit_id;
if(path.startsWith(Settings::getValue("remote", "clonedirectory").toString()))
commit_id = QString::fromStdString(remoteDatabase.localLastCommitId(remoteModel->currentClientCertificate(), url, pushDialog.branch().toStdString()));
commit_id = QString::fromStdString(remoteDatabase.localLastCommitId(remoteModel->currentClientCertificate(), url, branch.toStdString()));
// Push database
RemoteNetwork::get().push(path, url, remoteModel->currentClientCertificate(), pushDialog.name(),