diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-01-01 21:59:23 -0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-01-02 17:22:18 +0100 |
| commit | 18b1d9270d49a49c713cf75dffad9cdcf3a93edd (patch) | |
| tree | 1e4be81d36aaf5fa31c1ec69303431848fdc1a4e /src | |
| parent | d948408aacad2d12dd62dcbf0f36980fcb4127fa (diff) | |
Enforce prefixes "a/" and "b/" when doing git diff
The user can set different prefix using diff.mnemonicprefix or
diff.noprefix (see git-config(1)), so we need to force them to the
values that the diffeditor and PatchTool expect.
Task-number: QTCREATORBUG-13782
Change-Id: I3110a34b2575b89abe840e040690f3f0c36e955b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 1b8210bdc58..0f0e7322e6a 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -270,6 +270,7 @@ void GitDiffHandler::addJob(VcsCommand *command, args << QLatin1String("--ignore-space-change"); args << QLatin1String("--unified=") + QString::number( m_controller->contextLinesNumber()); + args << QLatin1String("--src-prefix=a/") << QLatin1String("--dst-prefix=b/"); args << arguments; command->addJob(args, timeout()); } |