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

Git: Include decorations in Show

Browse Source 
They got lost in 23b89f1e85.

Change-Id: I3ecbabf0886fdc66e6d7f097d48a02cff9df6cb3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2017-05-24 08:40:19 +03:00
committed by Orgad Shaneh
parent 5364140529
commit 232442bc2d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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