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

Git: added custom message to EnsureStash popup

Browse Source 
Better overview in stash dialog.

Change-Id: Icb6d3f8e2e068882e661e017ce8a0bb00ec6dba5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Petar Perisin
2013-01-12 18:52:05 +01:00
committed by Tobias Hunger
parent 8b419be12f
commit b7faf4d674
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/git/gitplugin.cpp
View File

@@ -901,7 +901,7 @@ void GitPlugin::pull()
}
}
GitClient::StashResult stashResult = m_gitClient->ensureStash(state.topLevel());
GitClient::StashResult stashResult = m_gitClient->ensureStash(state.topLevel(), QLatin1String("Pull"));
switch (stashResult) {
case GitClient::StashUnchanged:
case GitClient::Stashed:
@@ -1031,7 +1031,7 @@ void GitPlugin::promptApplyPatch()
void GitPlugin::applyPatch(const QString &workingDirectory, QString file)
{
// Ensure user has been notified about pending changes
switch (m_gitClient->ensureStash(workingDirectory)) {
switch (m_gitClient->ensureStash(workingDirectory, QLatin1String("Apply-Patch"))) {
case GitClient::StashUnchanged:
case GitClient::Stashed:
case GitClient::NotStashed: