diff options
| author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-06-08 13:51:29 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-06-10 12:05:31 +0000 |
| commit | ea476ffc39598f44e3f3b8d7efb6f75a06bf4c68 (patch) | |
| tree | 496ee63135f95d3c9a7438e240613ede0c950d41 /src/plugins/git | |
| parent | 2221636cfb60bdc1e54ab47a13b61ae752d2781e (diff) | |
ShellCommand: Store workingdirectory in the jobs
Not all jobs of one command can run in the same directory, so
prepare for having individual working directories per job.
Change-Id: Ice43361fe54f2b7153ccd38435f6108d83570082
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/git')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 0c9cda9c1f7..0070ad6fa67 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -472,7 +472,7 @@ class ConflictHandler : public QObject Q_OBJECT public: static void attachToCommand(VcsCommand *command, const QString &abortCommand = QString()) { - ConflictHandler *handler = new ConflictHandler(command->workingDirectory(), abortCommand); + ConflictHandler *handler = new ConflictHandler(command->defaultWorkingDirectory(), abortCommand); handler->setParent(command); // delete when command goes out of scope command->addFlags(VcsCommand::ExpectRepoChanges); |