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

Git: Replace msysGit with Git for Windows in comments

Browse Source 
msysGit is obsolete

Change-Id: Iaa2aee0de2e8280dcc060cdd26b41962fb38a112
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2016-11-29 16:11:42 +02:00
committed by Orgad Shaneh
parent 38cd2736ea
commit 329c24ce3a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/diffeditor/diffutils.cpp
View File

@@ -1137,7 +1137,7 @@ QList<FileData> DiffUtils::readPatch(const QString &patch, bool *ok)
QList<FileData> fileDataList; QList<FileData> fileDataList;
QString croppedPatch = patch; 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 QRegExp formatPatchEndingRegExp(QLatin1String("(\\n-- \\n\\S*\\n\\n$)"));
const int pos = formatPatchEndingRegExp.indexIn(patch); const int pos = formatPatchEndingRegExp.indexIn(patch);
if (pos != -1) if (pos != -1)

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

@@ -2229,7 +2229,7 @@ FileName GitClient::gitBinDirectory()
// Is 'git\cmd' in the path (folder containing .bats)? // Is 'git\cmd' in the path (folder containing .bats)?
QString path = QFileInfo(git).absolutePath(); 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 // and the real binaries are in {setup dir}/bin. If cmd is configured in PATH
// or in Git settings, return bin instead. // or in Git settings, return bin instead.
if (HostOsInfo::isWindowsHost() 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 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 // https://github.com/msysgit/msysgit/wiki/Git-for-Windows-Unicode-Support#convert-config-files
static QTextCodec *codec = HostOsInfo::isWindowsHost() static QTextCodec *codec = HostOsInfo::isWindowsHost()
? QTextCodec::codecForName("UTF-8") ? QTextCodec::codecForName("UTF-8")