From 8966b3352262ea775abcb95095b343a57f594c51 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sat, 11 Jan 2014 02:30:30 +0100 Subject: [PATCH] Directly use CString to avoid multiple type conversions in a row Signed-off-by: Sven Strickroth --- src/Git/Git.cpp | 2 +- src/Git/Git.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp index be4c30e6d..46ebadb94 100644 --- a/src/Git/Git.cpp +++ b/src/Git/Git.cpp @@ -1081,7 +1081,7 @@ int CGit::RunLogFile(CString cmd, const CString &filename, CString *stdErr) return exitcode; } -int CGit::GetHash(CGitHash &hash, const TCHAR* friendname) +int CGit::GetHash(CGitHash &hash, const CString& friendname) { // no need to parse a ref if it's already a 40-byte hash if (CGitHash::IsValidSHA1(friendname)) diff --git a/src/Git/Git.h b/src/Git/Git.h index 1e0a247cb..8f601bd24 100644 --- a/src/Git/Git.h +++ b/src/Git/Git.h @@ -290,7 +290,7 @@ public: CString GetLogCmd(const CString &range, const CTGitPath *path = NULL, int count=-1, int InfoMask = LOG_INFO_FULL_DIFF|LOG_INFO_STAT|LOG_INFO_FILESTATE|LOG_INFO_BOUNDARY|LOG_INFO_DETECT_COPYRENAME|LOG_INFO_SHOW_MERGEDFILE, bool paramonly=false, CFilterData * filter =NULL); - int GetHash(CGitHash &hash, const TCHAR* friendname); + int GetHash(CGitHash &hash, const CString& friendname); int BuildOutputFormat(CString &format,bool IsFull=TRUE); //int GetShortLog(const CString &log,CTGitPath * path=NULL, int count =-1); -- 2.11.4.GIT