diff options
| -rw-r--r-- | src/plugins/diffeditor/diffutils.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/diffeditor/diffutils.cpp b/src/plugins/diffeditor/diffutils.cpp index 2c906fd575..d3a186e5c6 100644 --- a/src/plugins/diffeditor/diffutils.cpp +++ b/src/plugins/diffeditor/diffutils.cpp @@ -1137,7 +1137,7 @@ QList<FileData> DiffUtils::readPatch(const QString &patch, bool *ok) QList<FileData> fileDataList; QString croppedPatch = patch; - // Crop e.g. "-- \n1.9.4.msysgit.0\n\n" at end of file + // Crop e.g. "-- \n2.10.2.windows.1\n\n" at end of file const QRegExp formatPatchEndingRegExp(QLatin1String("(\\n-- \\n\\S*\\n\\n$)")); const int pos = formatPatchEndingRegExp.indexIn(patch); if (pos != -1) diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 5ebd803c1d..a7aa1b8064 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -2229,7 +2229,7 @@ FileName GitClient::gitBinDirectory() // Is 'git\cmd' in the path (folder containing .bats)? QString path = QFileInfo(git).absolutePath(); - // Git for Windows (msysGit) has git and gitk redirect executables in {setup dir}/cmd + // Git for Windows has git and gitk redirect executables in {setup dir}/cmd // and the real binaries are in {setup dir}/bin. If cmd is configured in PATH // or in Git settings, return bin instead. if (HostOsInfo::isWindowsHost() @@ -2992,7 +2992,7 @@ QString GitClient::readGitVar(const QString &workingDirectory, const QString &co QString GitClient::readOneLine(const QString &workingDirectory, const QStringList &arguments) const { - // msysGit always uses UTF-8 for configuration: + // Git for Windows always uses UTF-8 for configuration: // https://github.com/msysgit/msysgit/wiki/Git-for-Windows-Unicode-Support#convert-config-files static QTextCodec *codec = HostOsInfo::isWindowsHost() ? QTextCodec::codecForName("UTF-8") |