diff options
| author | Andre Hartmann <aha_1980@gmx.de> | 2024-09-09 20:37:46 +0200 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2024-09-09 18:57:02 +0000 |
| commit | eee38e585e9aa962c03392f525d83723017c716c (patch) | |
| tree | 15bb0601ee9d173ff459482bfa29b3f917dbb935 /src/plugins/git/gitplugin.cpp | |
| parent | 7e70eefabe1a210c4afbbeeac89b3747dd724cac (diff) | |
Git: Replace "SHA1" with "hash" in code and comments
Change-Id: Iaa6712338b86a5a7fd4889734d5650c6751fcf95
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/git/gitplugin.cpp')
| -rw-r--r-- | src/plugins/git/gitplugin.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index b9035562b3b..9a5589b2284 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -1362,7 +1362,7 @@ IEditor *GitPluginPrivate::openSubmitEditor(const FilePath &fileName, const Comm QString title; switch (cd.commitType) { case AmendCommit: - title = Tr::tr("Amend %1").arg(cd.amendSHA1); + title = Tr::tr("Amend %1").arg(cd.amendHash); break; case FixupCommit: title = Tr::tr("Git Fixup Commit"); @@ -1393,14 +1393,14 @@ bool GitPluginPrivate::activateCommit() auto model = qobject_cast<SubmitFileModel *>(editor->fileModel()); const CommitType commitType = editor->commitType(); - const QString amendSHA1 = editor->amendSHA1(); - if (model->hasCheckedFiles() || !amendSHA1.isEmpty()) { + const QString amendHash = editor->amendHash(); + if (model->hasCheckedFiles() || !amendHash.isEmpty()) { // get message & commit if (!DocumentManager::saveDocument(editorDocument)) return false; if (!gitClient().addAndCommit(m_submitRepository, editor->panelData(), commitType, - amendSHA1, m_commitMessageFileName, model)) { + amendHash, m_commitMessageFileName, model)) { editor->updateFileModel(); return false; } @@ -1411,7 +1411,7 @@ bool GitPluginPrivate::activateCommit() NoPrompt, editor->panelData().pushAction)) { return false; } - gitClient().interactiveRebase(m_submitRepository, amendSHA1, true); + gitClient().interactiveRebase(m_submitRepository, amendHash, true); } else { gitClient().continueCommandIfNeeded(m_submitRepository); if (editor->panelData().pushAction == NormalPush) { |