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

Merge remote-tracking branch 'origin/4.3'

Browse Source 
Change-Id: I56004e3ec9dc9d92d33bdae438c4f7e069eccc45
This commit is contained in:
Orgad Shaneh
2017-06-02 15:03:36 +03:00
parent a9d511ff7d ec3015663a
commit 89057b552b
38 changed files with 225 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,7 +86,7 @@ const char stashNamePrefix[] = "stash@{";
const char noColorOption[] = "--no-color";
const char decorateOption[] = "--decorate";
const char showFormatC[] =
"--pretty=format:commit %H%n"
"--pretty=format:commit %H%d%n"
"Author: %an <%ae>, %ad (%ar)%n"
"Committer: %cn <%ce>, %cd (%cr)%n"
"%n"
@@ -359,7 +359,7 @@ private:
void ShowController::reload()
{
const QStringList args = {"show", "-s", noColorOption, decorateOption, showFormatC, m_id};
const QStringList args = {"show", "-s", noColorOption, showFormatC, m_id};
m_state = GettingDescription;
runCommand(QList<QStringList>() << args, GitPlugin::client()->encoding(m_directory, "i18n.commitEncoding"));
}