Correctly show reverse diff to working tree

[TortoiseGit.git] / src / Git / Git.cpp

// TortoiseGit - a Windows shell extension for easy version control

// Copyright (C) 2008-2014 - TortoiseGit

// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.

// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
// GNU General Public License for more details.

// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software Foundation,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
//

#include "stdafx.h"
#include "Git.h"
#include "GitRev.h"
#include "registry.h"
#include "GitForWindows.h"
#include <map>
#include "UnicodeUtils.h"
#include "gitdll.h"
#include <fstream>
#include "FormatMessageWrapper.h"
#include "SmartHandle.h"

int CGit::m_LogEncode=CP_UTF8;
typedef CComCritSecLock<CComCriticalSection> CAutoLocker;

static LPTSTR nextpath(wchar_t *path, wchar_t *buf, size_t buflen)
{
        wchar_t term, *base = path;

        if (path == NULL || buf == NULL || buflen == 0)
                return NULL;

        term = (*path == L'"') ? *path++ : L';';

        for (buflen--; *path && *path != term && buflen; buflen--)
                *buf++ = *path++;

        *buf = L'\0'; /* reserved a byte via initial subtract */

        while (*path == term || *path == L';')
                ++path;

        return (path != base) ? path : NULL;
}

static inline BOOL FileExists(LPCTSTR lpszFileName)
{
        struct _stat st;
        return _tstat(lpszFileName, &st) == 0;
}

static BOOL FindGitPath()
{
        size_t size;
        _tgetenv_s(&size, NULL, 0, _T("PATH"));

        if (!size)
        {
                return FALSE;
        }

        TCHAR *env = (TCHAR*)alloca(size * sizeof(TCHAR));
        _tgetenv_s(&size, env, size, _T("PATH"));

        TCHAR buf[MAX_PATH] = {0};

        // search in all paths defined in PATH
        while ((env = nextpath(env, buf, MAX_PATH - 1)) != NULL && *buf)
        {
                TCHAR *pfin = buf + _tcslen(buf)-1;

                // ensure trailing slash
                if (*pfin != _T('/') && *pfin != _T('\\'))
                        _tcscpy_s(++pfin, 2, _T("\\")); // we have enough space left, MAX_PATH-1 is used in nextpath above

                const size_t len = _tcslen(buf);

                if ((len + 7) < MAX_PATH)
                        _tcscpy_s(pfin + 1, MAX_PATH - len, _T("git.exe"));
                else
                        break;

                if ( FileExists(buf) )
                {
                        // dir found
                        pfin[1] = 0;
                        CGit::ms_LastMsysGitDir = buf;
                        CGit::ms_LastMsysGitDir.TrimRight(_T("\\"));
                        if (CGit::ms_LastMsysGitDir.GetLength() > 4)
                        {
                                // often the msysgit\cmd folder is on the %PATH%, but
                                // that git.exe does not work, so try to guess the bin folder
                                CString binDir = CGit::ms_LastMsysGitDir.Mid(0, CGit::ms_LastMsysGitDir.GetLength() - 4) + _T("\\bin\\git.exe");
                                if (FileExists(binDir))
                                        CGit::ms_LastMsysGitDir = CGit::ms_LastMsysGitDir.Mid(0, CGit::ms_LastMsysGitDir.GetLength() - 4) + _T("\\bin");
                        }
                        return TRUE;
                }
        }

        return FALSE;
}

static bool g_bSortLogical;
static bool g_bSortLocalBranchesFirst;

static void GetSortOptions()
{
        g_bSortLogical = !CRegDWORD(L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Policies\\Explorer\\NoStrCmpLogical", 0, false, HKEY_CURRENT_USER);
        if (g_bSortLogical)
                g_bSortLogical = !CRegDWORD(L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Policies\\Explorer\\NoStrCmpLogical", 0, false, HKEY_LOCAL_MACHINE);
        g_bSortLocalBranchesFirst = !CRegDWORD(L"Software\\TortoiseGit\\NoSortLocalBranchesFirst", 0, false, HKEY_CURRENT_USER);
        if (g_bSortLocalBranchesFirst)
                g_bSortLocalBranchesFirst = !CRegDWORD(L"Software\\TortoiseGit\\NoSortLocalBranchesFirst", 0, false, HKEY_LOCAL_MACHINE);
}

static int LogicalComparePredicate(const CString &left, const CString &right)
{
        if (g_bSortLogical)
                return StrCmpLogicalW(left, right) < 0;
        return StrCmpI(left, right) < 0;
}

static int LogicalCompareBranchesPredicate(const CString &left, const CString &right)
{
        if (g_bSortLocalBranchesFirst)
        {
                int leftIsRemote = left.Find(_T("remotes/"));
                int rightIsRemote = right.Find(_T("remotes/"));

                if (leftIsRemote == 0 && rightIsRemote < 0)
                        return false;
                else if (leftIsRemote < 0 && rightIsRemote == 0)
                        return true;
        }
        if (g_bSortLogical)
                return StrCmpLogicalW(left, right) < 0;
        return StrCmpI(left, right) < 0;
}

#define CALL_OUTPUT_READ_CHUNK_SIZE 1024

CString CGit::ms_LastMsysGitDir;
int CGit::ms_LastMsysGitVersion = 0;
CGit g_Git;


CGit::CGit(void)
{
        GetCurrentDirectory(MAX_PATH, m_CurrentDir.GetBuffer(MAX_PATH));
        m_CurrentDir.ReleaseBuffer();
        m_IsGitDllInited = false;
        m_GitDiff=0;
        m_GitSimpleListDiff=0;
        m_IsUseGitDLL = !!CRegDWORD(_T("Software\\TortoiseGit\\UsingGitDLL"),1);
        m_IsUseLibGit2 = !!CRegDWORD(_T("Software\\TortoiseGit\\UseLibgit2"), TRUE);
        m_IsUseLibGit2_mask = CRegDWORD(_T("Software\\TortoiseGit\\UseLibgit2_mask"), (1 << GIT_CMD_MERGE_BASE) | (1 << GIT_CMD_DELETETAGBRANCH) | (1 << GIT_CMD_GETONEFILE));

        SecureZeroMemory(&m_CurrentGitPi, sizeof(PROCESS_INFORMATION));

        GetSortOptions();
        this->m_bInitialized =false;
        CheckMsysGitDir();
        m_critGitDllSec.Init();
}

CGit::~CGit(void)
{
        if(this->m_GitDiff)
        {
                git_close_diff(m_GitDiff);
                m_GitDiff=0;
        }
        if(this->m_GitSimpleListDiff)
        {
                git_close_diff(m_GitSimpleListDiff);
                m_GitSimpleListDiff=0;
        }
}

bool CGit::IsBranchNameValid(const CString& branchname)
{
        if (branchname.Left(1) == _T("-")) // branch names starting with a dash are discouraged when used with git.exe, see https://github.com/git/git/commit/6348624010888bd2353e5cebdc2b5329490b0f6d
                return false;
        if (branchname.FindOneOf(_T("\"|<>")) >= 0) // not valid on Windows
                return false;
        CStringA branchA = CUnicodeUtils::GetUTF8(_T("refs/heads/") + branchname);
        return !!git_reference_is_valid_name(branchA);
}

int CGit::RunAsync(CString cmd, PROCESS_INFORMATION *piOut, HANDLE *hReadOut, HANDLE *hErrReadOut, CString *StdioFile)
{
        SECURITY_ATTRIBUTES sa;
        CAutoGeneralHandle hRead, hWrite, hReadErr, hWriteErr;
        CAutoGeneralHandle hStdioFile;

        sa.nLength = sizeof(SECURITY_ATTRIBUTES);
        sa.lpSecurityDescriptor=NULL;
        sa.bInheritHandle=TRUE;
        if (!CreatePipe(hRead.GetPointer(), hWrite.GetPointer(), &sa, 0))
        {
                CString err = CFormatMessageWrapper();
                CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": could not open stdout pipe: %s\n"), err.Trim());
                return TGIT_GIT_ERROR_OPEN_PIP;
        }
        if (hErrReadOut && !CreatePipe(hReadErr.GetPointer(), hWriteErr.GetPointer(), &sa, 0))
        {
                CString err = CFormatMessageWrapper();
                CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": could not open stderr pipe: %s\n"), err.Trim());
                return TGIT_GIT_ERROR_OPEN_PIP;
        }

        if(StdioFile)
        {
                hStdioFile=CreateFile(*StdioFile,GENERIC_WRITE,FILE_SHARE_READ | FILE_SHARE_WRITE,
                                                                &sa,CREATE_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL);
        }

        STARTUPINFO si;
        PROCESS_INFORMATION pi;
        si.cb=sizeof(STARTUPINFO);
        GetStartupInfo(&si);

        if (hErrReadOut)
                si.hStdError = hWriteErr;
        else
                si.hStdError = hWrite;
        if(StdioFile)
                si.hStdOutput=hStdioFile;
        else
                si.hStdOutput=hWrite;

        si.wShowWindow=SW_HIDE;
        si.dwFlags=STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW;

        LPTSTR pEnv = (!m_Environment.empty()) ? &m_Environment[0]: NULL;
        DWORD dwFlags = pEnv ? CREATE_UNICODE_ENVIRONMENT : 0;

        //DETACHED_PROCESS make ssh recognize that it has no console to launch askpass to input password.
        dwFlags |= DETACHED_PROCESS | CREATE_NEW_PROCESS_GROUP;

        memset(&this->m_CurrentGitPi,0,sizeof(PROCESS_INFORMATION));
        memset(&pi, 0, sizeof(PROCESS_INFORMATION));

        if(cmd.Find(_T("git")) == 0)
        {
                int firstSpace = cmd.Find(_T(" "));
                if (firstSpace > 0)
                        cmd = _T('"')+CGit::ms_LastMsysGitDir+_T("\\")+ cmd.Left(firstSpace) + _T('"')+ cmd.Mid(firstSpace);
                else
                        cmd=_T('"')+CGit::ms_LastMsysGitDir+_T("\\")+cmd+_T('"');
        }

        CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": executing %s\n"), cmd);
        if(!CreateProcess(NULL,(LPWSTR)cmd.GetString(), NULL,NULL,TRUE,dwFlags,pEnv,(LPWSTR)m_CurrentDir.GetString(),&si,&pi))
        {
                CString err = CFormatMessageWrapper();
                CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": error while executing command: %s\n"), err.Trim());
                return TGIT_GIT_ERROR_CREATE_PROCESS;
        }

        m_CurrentGitPi = pi;

        if(piOut)
                *piOut=pi;
        if(hReadOut)
                *hReadOut = hRead.Detach();
        if(hErrReadOut)
                *hErrReadOut = hReadErr.Detach();
        return 0;

}
//Must use sperate function to convert ANSI str to union code string
//Becuase A2W use stack as internal convert buffer.
void CGit::StringAppend(CString *str, const BYTE *p, int code,int length)
{
        if(str == NULL)
                return ;

        int len ;
        if(length<0)
                len = (int)strlen((const char*)p);
        else
                len=length;
        if (len == 0)
                return;
        int currentContentLen = str->GetLength();
        WCHAR * buf = str->GetBuffer(len * 4 + 1 + currentContentLen) + currentContentLen;
        int appendedLen = MultiByteToWideChar(code, 0, (LPCSTR)p, len, buf, len * 4);
        str->ReleaseBuffer(currentContentLen + appendedLen); // no - 1 because MultiByteToWideChar is called with a fixed length (thus no nul char included)
}

// This method was originally used to check for orphaned branches
BOOL CGit::CanParseRev(CString ref)
{
        if (ref.IsEmpty())
                ref = _T("HEAD");

        CString cmdout;
        if (Run(_T("git.exe rev-parse --revs-only ") + ref, &cmdout, CP_UTF8))
        {
                return FALSE;
        }
        if(cmdout.IsEmpty())
                return FALSE;

        return TRUE;
}

// Checks if we have an orphaned HEAD
BOOL CGit::IsInitRepos()
{
        CGitHash hash;
        // handle error on reading HEAD hash as init repo
        if (GetHash(hash, _T("HEAD")) != 0)
                return TRUE;
        return hash.IsEmpty() ? TRUE : FALSE;
}

DWORD WINAPI CGit::AsyncReadStdErrThread(LPVOID lpParam)
{
        PASYNCREADSTDERRTHREADARGS pDataArray;
        pDataArray = (PASYNCREADSTDERRTHREADARGS)lpParam;

        DWORD readnumber;
        BYTE data[CALL_OUTPUT_READ_CHUNK_SIZE];
        while (ReadFile(pDataArray->fileHandle, data, CALL_OUTPUT_READ_CHUNK_SIZE, &readnumber, NULL))
        {
                if (pDataArray->pcall->OnOutputErrData(data,readnumber))
                        break;
        }

        return 0;
}

int CGit::Run(CGitCall* pcall)
{
        PROCESS_INFORMATION pi;
        CAutoGeneralHandle hRead, hReadErr;
        if (RunAsync(pcall->GetCmd(), &pi, hRead.GetPointer(), hReadErr.GetPointer()))
                return TGIT_GIT_ERROR_CREATE_PROCESS;

        CAutoGeneralHandle piThread(pi.hThread);
        CAutoGeneralHandle piProcess(pi.hProcess);

        ASYNCREADSTDERRTHREADARGS threadArguments;
        threadArguments.fileHandle = hReadErr;
        threadArguments.pcall = pcall;
        CAutoGeneralHandle thread = CreateThread(NULL, 0, AsyncReadStdErrThread, &threadArguments, 0, NULL);

        DWORD readnumber;
        BYTE data[CALL_OUTPUT_READ_CHUNK_SIZE];
        bool bAborted=false;
        while(ReadFile(hRead,data,CALL_OUTPUT_READ_CHUNK_SIZE,&readnumber,NULL))
        {
                // TODO: when OnOutputData() returns 'true', abort git-command. Send CTRL-C signal?
                if(!bAborted)//For now, flush output when command aborted.
                        if(pcall->OnOutputData(data,readnumber))
                                bAborted=true;
        }
        if(!bAborted)
                pcall->OnEnd();

        if (thread)
                WaitForSingleObject(thread, INFINITE);

        WaitForSingleObject(pi.hProcess, INFINITE);
        DWORD exitcode =0;

        if(!GetExitCodeProcess(pi.hProcess,&exitcode))
        {
                CString err = CFormatMessageWrapper();
                CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": could not get exit code: %s\n"), err.Trim());
                return TGIT_GIT_ERROR_GET_EXIT_CODE;
        }
        else
                CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": process exited: %d\n"), exitcode);

        return exitcode;
}
class CGitCall_ByteVector : public CGitCall
{
public:
        CGitCall_ByteVector(CString cmd,BYTE_VECTOR* pvector, BYTE_VECTOR* pvectorErr = NULL):CGitCall(cmd),m_pvector(pvector),m_pvectorErr(pvectorErr){}
        virtual bool OnOutputData(const BYTE* data, size_t size)
        {
                if (!m_pvector || size == 0)
                        return false;
                size_t oldsize=m_pvector->size();
                m_pvector->resize(m_pvector->size()+size);
                memcpy(&*(m_pvector->begin()+oldsize),data,size);
                return false;
        }
        virtual bool OnOutputErrData(const BYTE* data, size_t size)
        {
                if (!m_pvectorErr || size == 0)
                        return false;
                size_t oldsize = m_pvectorErr->size();
                m_pvectorErr->resize(m_pvectorErr->size() + size);
                memcpy(&*(m_pvectorErr->begin() + oldsize), data, size);
                return false;
        }
        BYTE_VECTOR* m_pvector;
        BYTE_VECTOR* m_pvectorErr;

};
int CGit::Run(CString cmd,BYTE_VECTOR *vector, BYTE_VECTOR *vectorErr)
{
        CGitCall_ByteVector call(cmd, vector, vectorErr);
        return Run(&call);
}
int CGit::Run(CString cmd, CString* output, int code)
{
        CString err;
        int ret;
        ret = Run(cmd, output, &err, code);

        if (output && !err.IsEmpty())
        {
                if (!output->IsEmpty())
                        *output += _T("\n");
                *output += err;
        }

        return ret;
}
int CGit::Run(CString cmd, CString* output, CString* outputErr, int code)
{
        BYTE_VECTOR vector, vectorErr;
        int ret;
        if (outputErr)
                ret = Run(cmd, &vector, &vectorErr);
        else
                ret = Run(cmd, &vector);

        vector.push_back(0);
        StringAppend(output, &(vector[0]), code);

        if (outputErr)
        {
                vectorErr.push_back(0);
                StringAppend(outputErr, &(vectorErr[0]), code);
        }

        return ret;
}

class CGitCallCb : public CGitCall
{
public:
        CGitCallCb(CString cmd, const GitReceiverFunc& recv): CGitCall(cmd), m_recv(recv) {}

        virtual bool OnOutputData(const BYTE* data, size_t size) override
        {
                // Add data
                if (size == 0)
                        return false;
                int oldEndPos = m_buffer.GetLength();
                memcpy(m_buffer.GetBufferSetLength(oldEndPos + (int)size) + oldEndPos, data, size);
                m_buffer.ReleaseBuffer(oldEndPos + (int)size);

                // Break into lines and feed to m_recv
                int eolPos;
                while ((eolPos = m_buffer.Find('\n')) >= 0)
                {
                        m_recv(m_buffer.Left(eolPos));
                        m_buffer = m_buffer.Mid(eolPos + 1);
                }
                return false;
        }

        virtual bool OnOutputErrData(const BYTE*, size_t) override
        {
                return false; // Ignore error output for now
        }

        virtual void OnEnd() override
        {
                if (!m_buffer.IsEmpty())
                        m_recv(m_buffer);
                m_buffer.Empty(); // Just for sure
        }

private:
        GitReceiverFunc m_recv;
        CStringA m_buffer;
};

int CGit::Run(CString cmd, const GitReceiverFunc& recv)
{
        CGitCallCb call(cmd, recv);
        return Run(&call);
}

CString CGit::GetUserName(void)
{
        CEnvironment env;
        env.CopyProcessEnvironment();
        CString envname = env.GetEnv(_T("GIT_AUTHOR_NAME"));
        if (!envname.IsEmpty())
                return envname;
        return GetConfigValue(L"user.name");
}
CString CGit::GetUserEmail(void)
{
        CEnvironment env;
        env.CopyProcessEnvironment();
        CString envmail = env.GetEnv(_T("GIT_AUTHOR_EMAIL"));
        if (!envmail.IsEmpty())
                return envmail;

        return GetConfigValue(L"user.email");
}

CString CGit::GetConfigValue(const CString& name)
{
        CString configValue;
        int start = 0;
        if(this->m_IsUseGitDLL)
        {
                CAutoLocker lock(g_Git.m_critGitDllSec);

                try
                {
                        CheckAndInitDll();
                }catch(...)
                {
                }
                CStringA key, value;
                key =  CUnicodeUtils::GetUTF8(name);

                try
                {
                        if (git_get_config(key, value.GetBufferSetLength(4096), 4096))
                                return CString();
                }
                catch (const char *msg)
                {
                        ::MessageBox(NULL, _T("Could not get config.\nlibgit reports:\n") + CString(msg), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
                        return CString();
                }

                StringAppend(&configValue, (BYTE*)(LPCSTR)value);
                return configValue.Tokenize(_T("\n"),start);
        }
        else
        {
                CString cmd;
                cmd.Format(L"git.exe config %s", name);
                Run(cmd, &configValue, nullptr, CP_UTF8);
                return configValue.Tokenize(_T("\n"),start);
        }
}

bool CGit::GetConfigValueBool(const CString& name)
{
        CString configValue = GetConfigValue(name);
        configValue.MakeLower();
        configValue.Trim();
        if(configValue == _T("true") || configValue == _T("on") || configValue == _T("yes") || StrToInt(configValue) != 0)
                return true;
        else
                return false;
}

int CGit::SetConfigValue(const CString& key, const CString& value, CONFIG_TYPE type)
{
        if(this->m_IsUseGitDLL)
        {
                CAutoLocker lock(g_Git.m_critGitDllSec);

                try
                {
                        CheckAndInitDll();

                }catch(...)
                {
                }
                CStringA keya, valuea;
                keya = CUnicodeUtils::GetMulti(key, CP_UTF8);
                valuea = CUnicodeUtils::GetUTF8(value);

                try
                {
                        return [=]() { return get_set_config(keya, valuea, type); }();
                }
                catch (const char *msg)
                {
                        ::MessageBox(NULL, _T("Could not set config.\nlibgit reports:\n") + CString(msg), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
                        return -1;
                }
        }
        else
        {
                CString cmd;
                CString option;
                switch(type)
                {
                case CONFIG_GLOBAL:
                        option = _T("--global");
                        break;
                case CONFIG_SYSTEM:
                        option = _T("--system");
                        break;
                default:
                        break;
                }
                cmd.Format(_T("git.exe config %s %s \"%s\""), option, key, value);
                CString out;
                if (Run(cmd, &out, nullptr, CP_UTF8))
                {
                        return -1;
                }
        }
        return 0;
}

int CGit::UnsetConfigValue(const CString& key, CONFIG_TYPE type)
{
        if(this->m_IsUseGitDLL)
        {
                CAutoLocker lock(g_Git.m_critGitDllSec);

                try
                {
                        CheckAndInitDll();
                }catch(...)
                {
                }
                CStringA keya;
                keya = CUnicodeUtils::GetMulti(key, CP_UTF8);

                try
                {
                        return [=]() { return get_set_config(keya, nullptr, type); }();
                }
                catch (const char *msg)
                {
                        ::MessageBox(NULL, _T("Could not unset config.\nlibgit reports:\n") + CString(msg), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
                        return -1;
                }
        }
        else
        {
                CString cmd;
                CString option;
                switch(type)
                {
                case CONFIG_GLOBAL:
                        option = _T("--global");
                        break;
                case CONFIG_SYSTEM:
                        option = _T("--system");
                        break;
                default:
                        break;
                }
                cmd.Format(_T("git.exe config %s --unset %s"), option, key);
                CString out;
                if (Run(cmd, &out, nullptr, CP_UTF8))
                {
                        return -1;
                }
        }
        return 0;
}

CString CGit::GetCurrentBranch(bool fallback)
{
        CString output;
        //Run(_T("git.exe branch"),&branch);

        int result = GetCurrentBranchFromFile(m_CurrentDir, output, fallback);
        if (result != 0 && ((result == 1 && !fallback) || result != 1))
        {
                return _T("(no branch)");
        }
        else
                return output;

}

void CGit::GetRemoteTrackedBranch(const CString& localBranch, CString& pullRemote, CString& pullBranch)
{
        if (localBranch.IsEmpty())
                return;

        CString configName;
        configName.Format(L"branch.%s.remote", localBranch);
        pullRemote =  GetConfigValue(configName);

        //Select pull-branch from current branch
        configName.Format(L"branch.%s.merge", localBranch);
        pullBranch = StripRefName(GetConfigValue(configName));
}

void CGit::GetRemoteTrackedBranchForHEAD(CString& remote, CString& branch)
{
        CString refName;
        if (GetCurrentBranchFromFile(m_CurrentDir, refName))
                return;
        GetRemoteTrackedBranch(StripRefName(refName), remote, branch);
}

CString CGit::GetFullRefName(const CString& shortRefName)
{
        CString refName;
        CString cmd;
        cmd.Format(L"git.exe rev-parse --symbolic-full-name %s", shortRefName);
        if (Run(cmd, &refName, NULL, CP_UTF8) != 0)
                return CString();//Error
        int iStart = 0;
        return refName.Tokenize(L"\n", iStart);
}

CString CGit::StripRefName(CString refName)
{
        if(wcsncmp(refName, L"refs/heads/", 11) == 0)
                refName = refName.Mid(11);
        else if(wcsncmp(refName, L"refs/", 5) == 0)
                refName = refName.Mid(5);
        int start =0;
        return refName.Tokenize(_T("\n"),start);
}

int CGit::GetCurrentBranchFromFile(const CString &sProjectRoot, CString &sBranchOut, bool fallback)
{
        // read current branch name like git-gui does, by parsing the .git/HEAD file directly

        if ( sProjectRoot.IsEmpty() )
                return -1;

        CString sDotGitPath;
        if (!g_GitAdminDir.GetAdminDirPath(sProjectRoot, sDotGitPath))
                return -1;

        CString sHeadFile = sDotGitPath + _T("HEAD");

        FILE *pFile;
        _tfopen_s(&pFile, sHeadFile.GetString(), _T("r"));

        if (!pFile)
        {
                return -1;
        }

        char s[256] = {0};
        fgets(s, sizeof(s), pFile);

        fclose(pFile);

        const char *pfx = "ref: refs/heads/";
        const int len = 16;//strlen(pfx)

        if ( !strncmp(s, pfx, len) )
        {
                //# We're on a branch.  It might not exist.  But
                //# HEAD looks good enough to be a branch.
                CStringA utf8Branch(s + len);
                sBranchOut = CUnicodeUtils::GetUnicode(utf8Branch);
                sBranchOut.TrimRight(_T(" \r\n\t"));

                if ( sBranchOut.IsEmpty() )
                        return -1;
        }
        else if (fallback)
        {
                CStringA utf8Hash(s);
                CString unicodeHash = CUnicodeUtils::GetUnicode(utf8Hash);
                unicodeHash.TrimRight(_T(" \r\n\t"));
                if (CGitHash::IsValidSHA1(unicodeHash))
                        sBranchOut = unicodeHash;
                else
                        //# Assume this is a detached head.
                        sBranchOut = _T("HEAD");
                return 1;
        }
        else
        {
                //# Assume this is a detached head.
                sBranchOut = "HEAD";

                return 1;
        }

        return 0;
}

int CGit::BuildOutputFormat(CString &format,bool IsFull)
{
        CString log;
        log.Format(_T("#<%c>%%x00"),LOG_REV_ITEM_BEGIN);
        format += log;
        if(IsFull)
        {
                log.Format(_T("#<%c>%%an%%x00"),LOG_REV_AUTHOR_NAME);
                format += log;
                log.Format(_T("#<%c>%%ae%%x00"),LOG_REV_AUTHOR_EMAIL);
                format += log;
                log.Format(_T("#<%c>%%ai%%x00"),LOG_REV_AUTHOR_DATE);
                format += log;
                log.Format(_T("#<%c>%%cn%%x00"),LOG_REV_COMMIT_NAME);
                format += log;
                log.Format(_T("#<%c>%%ce%%x00"),LOG_REV_COMMIT_EMAIL);
                format += log;
                log.Format(_T("#<%c>%%ci%%x00"),LOG_REV_COMMIT_DATE);
                format += log;
                log.Format(_T("#<%c>%%b%%x00"),LOG_REV_COMMIT_BODY);
                format += log;
        }

        log.Format(_T("#<%c>%%m%%H%%x00"),LOG_REV_COMMIT_HASH);
        format += log;
        log.Format(_T("#<%c>%%P%%x00"),LOG_REV_COMMIT_PARENT);
        format += log;
        log.Format(_T("#<%c>%%s%%x00"),LOG_REV_COMMIT_SUBJECT);
        format += log;

        if(IsFull)
        {
                log.Format(_T("#<%c>%%x00"),LOG_REV_COMMIT_FILE);
                format += log;
        }
        return 0;
}

CString CGit::GetLogCmd(const CString &range, const CTGitPath *path, int count, int mask, bool paramonly,
                                                CFilterData *Filter)
{
        CString cmd;
        CString num;
        CString since;

        CString file = _T(" --");

        if(path)
                file.Format(_T(" -- \"%s\""),path->GetGitPathString());

        if(count>0)
                num.Format(_T("-n%d"),count);

        CString param;

        if(mask& LOG_INFO_STAT )
                param += _T(" --numstat ");
        if(mask& LOG_INFO_FILESTATE)
                param += _T(" --raw ");

        if(mask& LOG_INFO_FULLHISTORY)
                param += _T(" --full-history ");

        if(mask& LOG_INFO_BOUNDARY)
                param += _T(" --left-right --boundary ");

        if(mask& CGit::LOG_INFO_ALL_BRANCH)
                param += _T(" --all ");

        if(mask & CGit::LOG_INFO_LOCAL_BRANCHES)
                param += _T(" --branches ");

        if(mask& CGit::LOG_INFO_DETECT_COPYRENAME)
                param += _T(" -C ");

        if(mask& CGit::LOG_INFO_DETECT_RENAME )
                param += _T(" -M ");

        if(mask& CGit::LOG_INFO_FIRST_PARENT )
                param += _T(" --first-parent ");

        if(mask& CGit::LOG_INFO_NO_MERGE )
                param += _T(" --no-merges ");

        if(mask& CGit::LOG_INFO_FOLLOW)
                param += _T(" --follow ");

        if(mask& CGit::LOG_INFO_SHOW_MERGEDFILE)
                param += _T(" -c ");

        if(mask& CGit::LOG_INFO_FULL_DIFF)
                param += _T(" --full-diff ");

        if(mask& CGit::LOG_INFO_SIMPILFY_BY_DECORATION)
                param += _T(" --simplify-by-decoration ");

        param += range;

        CString st1,st2;

        if( Filter && (Filter->m_From != -1))
        {
                st1.Format(_T(" --max-age=%I64u "), Filter->m_From);
                param += st1;
        }

        if( Filter && (Filter->m_To != -1))
        {
                st2.Format(_T(" --min-age=%I64u "), Filter->m_To);
                param += st2;
        }

        bool isgrep = false;
        if( Filter && (!Filter->m_Author.IsEmpty()))
        {
                st1.Format(_T(" --author=\"%s\"" ),Filter->m_Author);
                param += st1;
                isgrep = true;
        }

        if( Filter && (!Filter->m_Committer.IsEmpty()))
        {
                st1.Format(_T(" --committer=\"%s\"" ),Filter->m_Author);
                param += st1;
                isgrep = true;
        }

        if( Filter && (!Filter->m_MessageFilter.IsEmpty()))
        {
                st1.Format(_T(" --grep=\"%s\"" ),Filter->m_MessageFilter);
                param += st1;
                isgrep = true;
        }

        if(Filter && isgrep)
        {
                if(!Filter->m_IsRegex)
                        param += _T(" --fixed-strings ");

                param += _T(" --regexp-ignore-case --extended-regexp ");
        }

        DWORD logOrderBy = CRegDWORD(_T("Software\\TortoiseGit\\LogOrderBy"), LOG_ORDER_TOPOORDER);
        if (logOrderBy == LOG_ORDER_TOPOORDER)
                param += _T(" --topo-order");
        else if (logOrderBy == LOG_ORDER_DATEORDER)
                param += _T(" --date-order");

        if(paramonly) //tgit.dll.Git.cpp:setup_revisions() only looks at args[1] and greater.  To account for this, pass a dummy parameter in the 0th place
                cmd.Format(_T("--ignore-this-parameter %s -z %s --parents "), num, param);
        else
        {
                CString log;
                BuildOutputFormat(log,!(mask&CGit::LOG_INFO_ONLY_HASH));
                cmd.Format(_T("git.exe log %s -z %s --parents --pretty=format:\"%s\""),
                                num,param,log);
        }

        cmd += file;

        return cmd;
}
#define BUFSIZE 512
void GetTempPath(CString &path)
{
        TCHAR lpPathBuffer[BUFSIZE] = { 0 };
        DWORD dwRetVal;
        DWORD dwBufSize=BUFSIZE;
        dwRetVal = GetTortoiseGitTempPath(dwBufSize,            // length of the buffer
                                                        lpPathBuffer);  // buffer for path
        if (dwRetVal > dwBufSize || (dwRetVal == 0))
        {
                path=_T("");
        }
        path.Format(_T("%s"),lpPathBuffer);
}
CString GetTempFile()
{
        TCHAR lpPathBuffer[BUFSIZE] = { 0 };
        DWORD dwRetVal;
        DWORD dwBufSize=BUFSIZE;
        TCHAR szTempName[BUFSIZE] = { 0 };
        UINT uRetVal;

        dwRetVal = GetTortoiseGitTempPath(dwBufSize,            // length of the buffer
                                                        lpPathBuffer);  // buffer for path
        if (dwRetVal > dwBufSize || (dwRetVal == 0))
        {
                return _T("");
        }
         // Create a temporary file.
        uRetVal = GetTempFileName(lpPathBuffer,         // directory for tmp files
                                                                TEXT("Patch"),  // temp file name prefix
                                                                0,                              // create unique name
                                                                szTempName);    // buffer for name


        if (uRetVal == 0)
        {
                return _T("");
        }

        return CString(szTempName);

}

DWORD GetTortoiseGitTempPath(DWORD nBufferLength, LPTSTR lpBuffer)
{
        DWORD result = ::GetTempPath(nBufferLength, lpBuffer);
        if (result == 0) return 0;
        if (lpBuffer == NULL || (result + 13 > nBufferLength))
        {
                if (lpBuffer)
                        lpBuffer[0] = '\0';
                return result + 13;
        }

        _tcscat_s(lpBuffer, nBufferLength, _T("TortoiseGit\\"));
        CreateDirectory(lpBuffer, NULL);

        return result + 13;
}

int CGit::RunLogFile(CString cmd, const CString &filename, CString *stdErr)
{
        STARTUPINFO si;
        PROCESS_INFORMATION pi;
        si.cb=sizeof(STARTUPINFO);
        GetStartupInfo(&si);

        SECURITY_ATTRIBUTES   psa={sizeof(psa),NULL,TRUE};;
        psa.bInheritHandle=TRUE;

        HANDLE hReadErr, hWriteErr;
        if (!CreatePipe(&hReadErr, &hWriteErr, &psa, 0))
        {
                CString err = CFormatMessageWrapper();
                CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": could not open stderr pipe: %s\n"), err.Trim());
                return TGIT_GIT_ERROR_OPEN_PIP;
        }

        HANDLE houtfile=CreateFile(filename,GENERIC_WRITE,FILE_SHARE_READ | FILE_SHARE_WRITE,
                        &psa,CREATE_ALWAYS,FILE_ATTRIBUTE_NORMAL,NULL);

        if (houtfile == INVALID_HANDLE_VALUE)
        {
                CString err = CFormatMessageWrapper();
                CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": could not open stdout pipe: %s\n"), err.Trim());
                CloseHandle(hReadErr);
                CloseHandle(hWriteErr);
                return TGIT_GIT_ERROR_OPEN_PIP;
        }

        si.wShowWindow = SW_HIDE;
        si.dwFlags = STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW;
        si.hStdOutput = houtfile;
        si.hStdError = hWriteErr;

        LPTSTR pEnv = (!m_Environment.empty()) ? &m_Environment[0]: NULL;
        DWORD dwFlags = pEnv ? CREATE_UNICODE_ENVIRONMENT : 0;

        if(cmd.Find(_T("git")) == 0)
                cmd=CGit::ms_LastMsysGitDir+_T("\\")+cmd;

        CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": executing %s\n"), cmd);
        if(!CreateProcess(NULL,(LPWSTR)cmd.GetString(), NULL,NULL,TRUE,dwFlags,pEnv,(LPWSTR)m_CurrentDir.GetString(),&si,&pi))
        {
                CString err = CFormatMessageWrapper();
                CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": failed to create Process: %s\n"), err.Trim());
                stdErr = &err;
                CloseHandle(hReadErr);
                CloseHandle(hWriteErr);
                CloseHandle(houtfile);
                return TGIT_GIT_ERROR_CREATE_PROCESS;
        }

        BYTE_VECTOR stderrVector;
        CGitCall_ByteVector pcall(L"", nullptr, &stderrVector);
        HANDLE thread;
        ASYNCREADSTDERRTHREADARGS threadArguments;
        threadArguments.fileHandle = hReadErr;
        threadArguments.pcall = &pcall;
        thread = CreateThread(nullptr, 0, AsyncReadStdErrThread, &threadArguments, 0, nullptr);

        WaitForSingleObject(pi.hProcess,INFINITE);

        CloseHandle(hWriteErr);
        CloseHandle(hReadErr);

        if (thread)
                WaitForSingleObject(thread, INFINITE);

        stderrVector.push_back(0);
        StringAppend(stdErr, &(stderrVector[0]), CP_UTF8);

        DWORD exitcode = 0;
        if (!GetExitCodeProcess(pi.hProcess, &exitcode))
        {
                CString err = CFormatMessageWrapper();
                CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": could not get exit code: %s\n"), err.Trim());
                return TGIT_GIT_ERROR_GET_EXIT_CODE;
        }
        else
                CTraceToOutputDebugString::Instance()(_T(__FUNCTION__) _T(": process exited: %d\n"), exitcode);

        CloseHandle(pi.hThread);
        CloseHandle(pi.hProcess);
        CloseHandle(houtfile);
        return exitcode;
}

git_repository * CGit::GetGitRepository() const
{
        git_repository * repo = nullptr;
        git_repository_open(&repo, GetGitPathStringA(m_CurrentDir));
        return repo;
}

int CGit::GetHash(git_repository * repo, CGitHash &hash, const CString& friendname, bool skipFastCheck /* = false */)
{
        ATLASSERT(repo);

        // no need to parse a ref if it's already a 40-byte hash
        if (!skipFastCheck && CGitHash::IsValidSHA1(friendname))
        {
                hash = CGitHash(friendname);
                return 0;
        }

        int isHeadOrphan = git_repository_head_unborn(repo);
        if (isHeadOrphan != 0)
        {
                hash.Empty();
                if (isHeadOrphan == 1)
                        return 0;
                else
                        return -1;
        }

        CAutoObject gitObject;
        if (git_revparse_single(gitObject.GetPointer(), repo, CUnicodeUtils::GetUTF8(friendname)))
                return -1;

        const git_oid * oid = git_object_id(gitObject);
        if (!oid)
                return -1;

        hash = CGitHash((char *)oid->id);

        return 0;
}

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))
        {
                hash = CGitHash(friendname);
                return 0;
        }

        if (m_IsUseLibGit2)
        {
                CAutoRepository repo(GetGitRepository());
                if (!repo)
                        return -1;

                return GetHash(repo, hash, friendname, true);
        }
        else
        {
                CString cmd;
                cmd.Format(_T("git.exe rev-parse %s" ),FixBranchName(friendname));
                gitLastErr.Empty();
                int ret = Run(cmd, &gitLastErr, NULL, CP_UTF8);
                hash = CGitHash(gitLastErr.Trim());
                if (ret == 0)
                        gitLastErr.Empty();
                return ret;
        }
}

int CGit::GetInitAddList(CTGitPathList &outputlist)
{
        CString cmd;
        BYTE_VECTOR cmdout;

        cmd=_T("git.exe ls-files -s -t -z");
        outputlist.Clear();
        if (Run(cmd, &cmdout))
                return -1;

        if (outputlist.ParserFromLsFile(cmdout))
                return -1;
        for(int i = 0; i < outputlist.GetCount(); ++i)
                const_cast<CTGitPath&>(outputlist[i]).m_Action = CTGitPath::LOGACTIONS_ADDED;

        return 0;
}
int CGit::GetCommitDiffList(const CString &rev1, const CString &rev2, CTGitPathList &outputlist, bool ignoreSpaceAtEol, bool ignoreSpaceChange, bool ignoreAllSpace , bool ignoreBlankLines)
{
        CString cmd;
        CString ignore;
        if (ignoreSpaceAtEol)
                ignore += _T(" --ignore-space-at-eol");
        if (ignoreSpaceChange)
                ignore += _T(" --ignore-space-change");
        if (ignoreAllSpace)
                ignore += _T(" --ignore-all-space");
        if (ignoreBlankLines)
                ignore += _T(" --ignore-blank-lines");

        if(rev1 == GIT_REV_ZERO || rev2 == GIT_REV_ZERO)
        {
                //rev1=+_T("");
                if(rev1 == GIT_REV_ZERO)
                        cmd.Format(_T("git.exe diff -r --raw -C -M --numstat -z %s %s --"), ignore, rev2);
                else
                        cmd.Format(_T("git.exe diff -r -R --raw -C -M --numstat -z %s %s --"), ignore, rev1);
        }
        else
        {
                cmd.Format(_T("git.exe diff-tree -r --raw -C -M --numstat -z %s %s %s --"), ignore, rev2, rev1);
        }

        BYTE_VECTOR out;
        if (Run(cmd, &out))
                return -1;

        outputlist.ParserFromLog(out);

        return 0;
}

int addto_list_each_ref_fn(const char *refname, const unsigned char * /*sha1*/, int /*flags*/, void *cb_data)
{
        STRING_VECTOR *list = (STRING_VECTOR*)cb_data;
        CString str;
        g_Git.StringAppend(&str, (BYTE*)refname, CP_UTF8);
        list->push_back(str);
        return 0;
}

int CGit::GetTagList(STRING_VECTOR &list)
{
        if (this->m_IsUseLibGit2)
        {
                CAutoRepository repo(GetGitRepository());
                if (!repo)
                        return -1;

                CAutoStrArray tag_names;

                if (git_tag_list(tag_names, repo))
                        return -1;

                for (size_t i = 0; i < tag_names->count; ++i)
                {
                        CStringA tagName(tag_names->strings[i]);
                        list.push_back(CUnicodeUtils::GetUnicode(tagName));
                }

                std::sort(list.begin(), list.end(), LogicalComparePredicate);

                return 0;
        }
        else
        {
                CString cmd, output;
                cmd=_T("git.exe tag -l");
                int ret = Run(cmd, &output, NULL, CP_UTF8);
                if(!ret)
                {
                        int pos=0;
                        CString one;
                        while( pos>=0 )
                        {
                                one=output.Tokenize(_T("\n"),pos);
                                if (!one.IsEmpty())
                                        list.push_back(one);
                        }
                        std::sort(list.begin(), list.end(), LogicalComparePredicate);
                }
                return ret;
        }
}

/**
Use this method only if m_IsUseLibGit2 is used for fallbacks.
If you directly use libgit2 methods, use GetLibGit2LastErr instead.
*/
CString CGit::GetGitLastErr(const CString& msg)
{
        if (this->m_IsUseLibGit2)
                return GetLibGit2LastErr(msg);
        else if (gitLastErr.IsEmpty())
                return msg + _T("\nUnknown git.exe error.");
        else
        {
                CString lastError = gitLastErr;
                gitLastErr.Empty();
                return msg + _T("\n") + lastError;
        }
}

CString CGit::GetGitLastErr(const CString& msg, LIBGIT2_CMD cmd)
{
        if (UsingLibGit2(cmd))
                return GetLibGit2LastErr(msg);
        else if (gitLastErr.IsEmpty())
                return msg + _T("\nUnknown git.exe error.");
        else
        {
                CString lastError = gitLastErr;
                gitLastErr.Empty();
                return msg + _T("\n") + lastError;
        }
}

CString CGit::GetLibGit2LastErr()
{
        const git_error *libgit2err = giterr_last();
        if (libgit2err)
        {
                CString lastError = CUnicodeUtils::GetUnicode(CStringA(libgit2err->message));
                giterr_clear();
                return _T("libgit2 returned: ") + lastError;
        }
        else
                return _T("An error occoured in libgit2, but no message is available.");
}

CString CGit::GetLibGit2LastErr(const CString& msg)
{
        if (!msg.IsEmpty())
                return msg + _T("\n") + GetLibGit2LastErr();
        return GetLibGit2LastErr();
}

CString CGit::FixBranchName_Mod(CString& branchName)
{
        if(branchName == "FETCH_HEAD")
                branchName = DerefFetchHead();
        return branchName;
}

CString CGit::FixBranchName(const CString& branchName)
{
        CString tempBranchName = branchName;
        FixBranchName_Mod(tempBranchName);
        return tempBranchName;
}

bool CGit::IsBranchTagNameUnique(const CString& name)
{
        if (m_IsUseLibGit2)
        {
                CAutoRepository repo(GetGitRepository());
                if (!repo)
                        return true; // TODO: optimize error reporting

                CAutoReference tagRef;
                if (git_reference_lookup(tagRef.GetPointer(), repo, CUnicodeUtils::GetUTF8(L"refs/tags/" + name)))
                        return true;

                CAutoReference branchRef;
                if (git_reference_lookup(branchRef.GetPointer(), repo, CUnicodeUtils::GetUTF8(L"refs/heads/" + name)))
                        return true;

                return false;
        }
        // else
        CString output;

        CString cmd;
        cmd.Format(_T("git.exe show-ref --tags --heads refs/heads/%s refs/tags/%s"), name, name);
        int ret = Run(cmd, &output, NULL, CP_UTF8);
        if (!ret)
        {
                int i = 0, pos = 0;
                while (pos >= 0)
                {
                        if (!output.Tokenize(_T("\n"), pos).IsEmpty())
                                ++i;
                }
                if (i >= 2)
                        return false;
        }

        return true;
}

/*
Checks if a branch or tag with the given name exists
isBranch is true -> branch, tag otherwise
*/
bool CGit::BranchTagExists(const CString& name, bool isBranch /*= true*/)
{
        if (m_IsUseLibGit2)
        {
                CAutoRepository repo(GetGitRepository());
                if (!repo)
                        return false; // TODO: optimize error reporting

                CString prefix;
                if (isBranch)
                        prefix = _T("refs/heads/");
                else
                        prefix = _T("refs/tags/");

                CAutoReference ref;
                if (git_reference_lookup(ref.GetPointer(), repo, CUnicodeUtils::GetUTF8(prefix + name)))
                        return false;

                return true;
        }
        // else
        CString cmd, output;

        cmd = _T("git.exe show-ref ");
        if (isBranch)
                cmd += _T("--heads ");
        else
                cmd += _T("--tags ");

        cmd += _T("refs/heads/") + name;
        cmd += _T(" refs/tags/") + name;

        int ret = Run(cmd, &output, NULL, CP_UTF8);
        if (!ret)
        {
                if (!output.IsEmpty())
                        return true;
        }

        return false;
}

CString CGit::DerefFetchHead()
{
        CString dotGitPath;
        g_GitAdminDir.GetAdminDirPath(m_CurrentDir, dotGitPath);
        std::ifstream fetchHeadFile((dotGitPath + L"FETCH_HEAD").GetString(), std::ios::in | std::ios::binary);
        int forMergeLineCount = 0;
        std::string line;
        std::string hashToReturn;
        while(getline(fetchHeadFile, line))
        {
                //Tokenize this line
                std::string::size_type prevPos = 0;
                std::string::size_type pos = line.find('\t');
                if(pos == std::string::npos)    continue; //invalid line

                std::string hash = line.substr(0, pos);
                ++pos; prevPos = pos; pos = line.find('\t', pos); if(pos == std::string::npos) continue;

                bool forMerge = pos == prevPos;
                ++pos; prevPos = pos; pos = line.size(); if(pos == std::string::npos) continue;

                std::string remoteBranch = line.substr(prevPos, pos - prevPos);

                //Process this line
                if(forMerge)
                {
                        hashToReturn = hash;
                        ++forMergeLineCount;
                        if(forMergeLineCount > 1)
                                return L""; //More then 1 branch to merge found. Octopus merge needed. Cannot pick single ref from FETCH_HEAD
                }
        }

        return CUnicodeUtils::GetUnicode(hashToReturn.c_str());
}

int CGit::GetBranchList(STRING_VECTOR &list,int *current,BRANCH_TYPE type)
{
        int ret = 0;
        CString cur;
        if (m_IsUseLibGit2)
        {
                CAutoRepository repo(GetGitRepository());
                if (!repo)
                        return -1;

                if (git_repository_head_detached(repo) == 1)
                        cur = _T("(detached from ");

                if ((type & (BRANCH_LOCAL | BRANCH_REMOTE)) != 0)
                {
                        git_branch_t flags = GIT_BRANCH_LOCAL;
                        if ((type & BRANCH_LOCAL) && (type & BRANCH_REMOTE))
                                flags = GIT_BRANCH_ALL;
                        else if (type & BRANCH_REMOTE)
                                flags = GIT_BRANCH_REMOTE;

                        CAutoBranchIterator it;
                        if (git_branch_iterator_new(it.GetPointer(), repo, flags))
                                return -1;

                        git_reference * ref = nullptr;
                        git_branch_t branchType;
                        while (git_branch_next(&ref, &branchType, it) == 0)
                        {
                                CAutoReference autoRef(ref);
                                const char * name = nullptr;
                                if (git_branch_name(&name, ref))
                                        continue;

                                CString branchname = CUnicodeUtils::GetUnicode(name);
                                if (branchType & GIT_BRANCH_REMOTE)
                                        list.push_back(_T("remotes/") + branchname);
                                else
                                {
                                        if (git_branch_is_head(ref))
                                                cur = branchname;
                                        list.push_back(branchname);
                                }
                        }
                }
        }
        else
        {
                CString cmd, output;
                cmd = _T("git.exe branch --no-color");

                if ((type & BRANCH_ALL) == BRANCH_ALL)
                        cmd += _T(" -a");
                else if (type & BRANCH_REMOTE)
                        cmd += _T(" -r");

                ret = Run(cmd, &output, nullptr, CP_UTF8);
                if (!ret)
                {
                        int pos = 0;
                        CString one;
                        while (pos >= 0)
                        {
                                one = output.Tokenize(_T("\n"), pos);
                                one.Trim(L" \r\n\t");
                                if (one.Find(L" -> ") >= 0 || one.IsEmpty())
                                        continue; // skip something like: refs/origin/HEAD -> refs/origin/master
                                if (one[0] == _T('*'))
                                {
                                        one = one.Mid(2);
                                        cur = one;
                                }
                                if (one.Left(10) != _T("(no branch") && one.Left(15) != _T("(detached from "))
                                        list.push_back(one);
                        }
                }
        }

        if(type & BRANCH_FETCH_HEAD && !DerefFetchHead().IsEmpty())
                list.push_back(L"FETCH_HEAD");

        std::sort(list.begin(), list.end(), LogicalCompareBranchesPredicate);

        if (current && cur.Left(10) != _T("(no branch") && cur.Left(15) != _T("(detached from "))
        {
                for (unsigned int i = 0; i < list.size(); ++i)
                {
                        if (list[i] == cur)
                        {
                                *current = i;
                                break;
                        }
                }
        }

        return ret;
}

int CGit::GetRemoteList(STRING_VECTOR &list)
{
        if (this->m_IsUseLibGit2)
        {
                CAutoRepository repo(GetGitRepository());
                if (!repo)
                        return -1;

                CAutoStrArray remotes;
                if (git_remote_list(remotes, repo))
                        return -1;

                for (size_t i = 0; i < remotes->count; ++i)
                {
                        CStringA remote(remotes->strings[i]);
                        list.push_back(CUnicodeUtils::GetUnicode(remote));
                }

                std::sort(list.begin(), list.end());

                return 0;
        }
        else
        {
                int ret;
                CString cmd, output;
                cmd=_T("git.exe remote");
                ret = Run(cmd, &output, NULL, CP_UTF8);
                if(!ret)
                {
                        int pos=0;
                        CString one;
                        while( pos>=0 )
                        {
                                one=output.Tokenize(_T("\n"),pos);
                                if (!one.IsEmpty())
                                        list.push_back(one);
                        }
                }
                return ret;
        }
}

int CGit::GetRemoteTags(const CString& remote, STRING_VECTOR &list)
{
        CString cmd, out, err;
        cmd.Format(_T("git.exe ls-remote -t \"%s\""), remote);
        if (Run(cmd, &out, &err, CP_UTF8))
        {
                MessageBox(NULL, err, _T("TortoiseGit"), MB_ICONERROR);
                return -1;
        }

        int pos = 0;
        while (pos >= 0)
        {
                CString one = out.Tokenize(_T("\n"), pos).Mid(51).Trim(); // sha1, tab + refs/tags/
                // dot not include annotated tags twice; this works, because an annotated tag appears twice (one normal tag and one with ^{} at the end)
                if (one.Find(_T("^{}")) >= 1)
                        continue;
                if (!one.IsEmpty())
                        list.push_back(one);
        }
        std::sort(list.begin(), list.end(), LogicalComparePredicate);
        return 0;
}

int libgit2_addto_list_each_ref_fn(git_reference *ref, void *payload)
{
        STRING_VECTOR *list = (STRING_VECTOR*)payload;
        CString str;
        g_Git.StringAppend(&str, (BYTE*)git_reference_name(ref), CP_UTF8);
        list->push_back(str);
        return 0;
}

int CGit::GetRefList(STRING_VECTOR &list)
{
        if (this->m_IsUseLibGit2)
        {
                CAutoRepository repo(GetGitRepository());
                if (!repo)
                        return -1;

                if (git_reference_foreach(repo, libgit2_addto_list_each_ref_fn, &list))
                        return -1;

                std::sort(list.begin(), list.end(), LogicalComparePredicate);

                return 0;
        }
        else
        {
                CString cmd, output;
                cmd=_T("git.exe show-ref -d");
                int ret = Run(cmd, &output, NULL, CP_UTF8);
                if(!ret)
                {
                        int pos=0;
                        CString one;
                        while( pos>=0 )
                        {
                                one=output.Tokenize(_T("\n"),pos);
                                int start=one.Find(_T(" "),0);
                                if(start>0)
                                {
                                        CString name;
                                        name=one.Right(one.GetLength()-start-1);
                                        list.push_back(name);
                                }
                        }
                        std::sort(list.begin(), list.end(), LogicalComparePredicate);
                }
                return ret;
        }
}

typedef struct map_each_ref_payload {
        git_repository * repo;
        MAP_HASH_NAME * map;
} map_each_ref_payload;

int libgit2_addto_map_each_ref_fn(git_reference *ref, void *payload)
{
        map_each_ref_payload *payloadContent = (map_each_ref_payload*)payload;

        CString str;
        g_Git.StringAppend(&str, (BYTE*)git_reference_name(ref), CP_UTF8);

        CAutoObject gitObject;
        if (git_revparse_single(gitObject.GetPointer(), payloadContent->repo, git_reference_name(ref)))
                return 1;

        if (git_object_type(gitObject) == GIT_OBJ_TAG)
        {
                str += _T("^{}"); // deref tag
                CAutoObject derefedTag;
                if (git_object_peel(derefedTag.GetPointer(), gitObject, GIT_OBJ_ANY))
                        return 1;
                gitObject.Swap(derefedTag);
        }

        const git_oid * oid = git_object_id(gitObject);
        if (oid == NULL)
                return 1;

        CGitHash hash((char *)oid->id);
        (*payloadContent->map)[hash].push_back(str);

        return 0;
}
int CGit::GetMapHashToFriendName(git_repository* repo, MAP_HASH_NAME &map)
{
        ATLASSERT(repo);

        map_each_ref_payload payloadContent = { repo, &map };

        if (git_reference_foreach(repo, libgit2_addto_map_each_ref_fn, &payloadContent))
                return -1;

        for (auto it = map.begin(); it != map.end(); ++it)
        {
                std::sort(it->second.begin(), it->second.end());
        }

        return 0;
}

int CGit::GetMapHashToFriendName(MAP_HASH_NAME &map)
{
        if (this->m_IsUseLibGit2)
        {
                CAutoRepository repo(GetGitRepository());
                if (!repo)
                        return -1;

                return GetMapHashToFriendName(repo, map);
        }
        else
        {
                CString cmd, output;
                cmd=_T("git.exe show-ref -d");
                int ret = Run(cmd, &output, NULL, CP_UTF8);
                if(!ret)
                {
                        int pos=0;
                        CString one;
                        while( pos>=0 )
                        {
                                one=output.Tokenize(_T("\n"),pos);
                                int start=one.Find(_T(" "),0);
                                if(start>0)
                                {
                                        CString name;
                                        name=one.Right(one.GetLength()-start-1);

                                        CString hash;
                                        hash=one.Left(start);

                                        map[CGitHash(hash)].push_back(name);
                                }
                        }
                }
                return ret;
        }
}

static void SetLibGit2SearchPath(int level, const CString &value)
{
        CStringA valueA = CUnicodeUtils::GetMulti(value, CP_UTF8);
        git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH, level, valueA);
}

static void SetLibGit2TemplatePath(const CString &value)
{
        CStringA valueA = CUnicodeUtils::GetMulti(value, CP_UTF8);
        git_libgit2_opts(GIT_OPT_SET_TEMPLATE_PATH, valueA);
}

BOOL CGit::CheckMsysGitDir(BOOL bFallback)
{
        if (m_bInitialized)
        {
                return TRUE;
        }

        this->m_Environment.clear();
        m_Environment.CopyProcessEnvironment();

        TCHAR *oldpath;
        size_t homesize,size;

        // set HOME if not set already
        _tgetenv_s(&homesize, NULL, 0, _T("HOME"));
        if (!homesize)
                m_Environment.SetEnv(_T("HOME"), GetHomeDirectory());

        //setup ssh client
        CString sshclient=CRegString(_T("Software\\TortoiseGit\\SSH"));
        if (sshclient.IsEmpty())
                sshclient = CRegString(_T("Software\\TortoiseGit\\SSH"), _T(""), FALSE, HKEY_LOCAL_MACHINE);

        if(!sshclient.IsEmpty())
        {
                m_Environment.SetEnv(_T("GIT_SSH"), sshclient);
                m_Environment.SetEnv(_T("SVN_SSH"), sshclient);
        }
        else
        {
                TCHAR sPlink[MAX_PATH] = {0};
                GetModuleFileName(NULL, sPlink, _countof(sPlink));
                LPTSTR ptr = _tcsrchr(sPlink, _T('\\'));
                if (ptr) {
                        _tcscpy_s(ptr + 1, MAX_PATH - (ptr - sPlink + 1), _T("TortoiseGitPLink.exe"));
                        m_Environment.SetEnv(_T("GIT_SSH"), sPlink);
                        m_Environment.SetEnv(_T("SVN_SSH"), sPlink);
                }
        }

        {
                TCHAR sAskPass[MAX_PATH] = {0};
                GetModuleFileName(NULL, sAskPass, _countof(sAskPass));
                LPTSTR ptr = _tcsrchr(sAskPass, _T('\\'));
                if (ptr)
                {
                        _tcscpy_s(ptr + 1, MAX_PATH - (ptr - sAskPass + 1), _T("SshAskPass.exe"));
                        m_Environment.SetEnv(_T("DISPLAY"),_T(":9999"));
                        m_Environment.SetEnv(_T("SSH_ASKPASS"),sAskPass);
                        m_Environment.SetEnv(_T("GIT_ASKPASS"),sAskPass);
                }
        }

        // add git/bin path to PATH

        CRegString msysdir=CRegString(REG_MSYSGIT_PATH,_T(""),FALSE);
        CString str = msysdir;
        if(str.IsEmpty() || !FileExists(str + _T("\\git.exe")))
        {
                if (!bFallback)
                        return FALSE;

                CRegString msyslocalinstalldir = CRegString(REG_MSYSGIT_INSTALL_LOCAL, _T(""), FALSE, HKEY_CURRENT_USER);
                str = msyslocalinstalldir;
                str.TrimRight(_T("\\"));
                if (str.IsEmpty())
                {
                        CRegString msysinstalldir = CRegString(REG_MSYSGIT_INSTALL, _T(""), FALSE, HKEY_LOCAL_MACHINE);
                        str = msysinstalldir;
                        str.TrimRight(_T("\\"));
                }
                if ( !str.IsEmpty() )
                {
                        str += "\\bin";
                        msysdir=str;
                        CGit::ms_LastMsysGitDir = str;
                        msysdir.write();
                }
                else
                {
                        // search PATH if git/bin directory is already present
                        if ( FindGitPath() )
                        {
                                m_bInitialized = TRUE;
                                msysdir = CGit::ms_LastMsysGitDir;
                                msysdir.write();
                                return TRUE;
                        }

                        return FALSE;
                }
        }
        else
        {
                CGit::ms_LastMsysGitDir = str;
        }

        // check for git.exe existance (maybe it was deinstalled in the meantime)
        if (!FileExists(CGit::ms_LastMsysGitDir + _T("\\git.exe")))
                return FALSE;

        // Configure libgit2 search paths
        CString msysGitDir;
        PathCanonicalize(msysGitDir.GetBufferSetLength(MAX_PATH), CGit::ms_LastMsysGitDir + _T("\\..\\etc"));
        msysGitDir.ReleaseBuffer();
        SetLibGit2SearchPath(GIT_CONFIG_LEVEL_SYSTEM, msysGitDir);
        SetLibGit2SearchPath(GIT_CONFIG_LEVEL_GLOBAL, g_Git.GetHomeDirectory());
        SetLibGit2SearchPath(GIT_CONFIG_LEVEL_XDG, g_Git.GetGitGlobalXDGConfigPath());
        CString msysGitTemplateDir;
        PathCanonicalize(msysGitTemplateDir.GetBufferSetLength(MAX_PATH), CGit::ms_LastMsysGitDir + _T("\\..\\share\\git-core\\templates"));
        msysGitTemplateDir.ReleaseBuffer();
        SetLibGit2TemplatePath(msysGitTemplateDir);

        //set path
        _tdupenv_s(&oldpath,&size,_T("PATH"));

        CString path;
        path.Format(_T("%s;%s"),oldpath,str + _T(";")+ (CString)CRegString(REG_MSYSGIT_EXTRA_PATH,_T(""),FALSE));

        m_Environment.SetEnv(_T("PATH"), path);

        CString str1 = m_Environment.GetEnv(_T("PATH"));

        CString sOldPath = oldpath;
        free(oldpath);

        m_bInitialized = TRUE;
        return true;
}

CString CGit::GetHomeDirectory() const
{
        const wchar_t * homeDir = wget_windows_home_directory();
        return CString(homeDir, (int)wcslen(homeDir));
}

CString CGit::GetGitLocalConfig() const
{
        CString path;
        g_GitAdminDir.GetAdminDirPath(m_CurrentDir, path);
        path += _T("config");
        return path;
}

CStringA CGit::GetGitPathStringA(const CString &path)
{
        return CUnicodeUtils::GetUTF8(CTGitPath(path).GetGitPathString());
}

CString CGit::GetGitGlobalConfig() const
{
        return g_Git.GetHomeDirectory() + _T("\\.gitconfig");
}

CString CGit::GetGitGlobalXDGConfigPath() const
{
        return g_Git.GetHomeDirectory() + _T("\\.config\\git");
}

CString CGit::GetGitGlobalXDGConfig() const
{
        return g_Git.GetGitGlobalXDGConfigPath() + _T("\\config");
}

CString CGit::GetGitSystemConfig() const
{
        const wchar_t * systemConfig = wget_msysgit_etc();
        return CString(systemConfig, (int)wcslen(systemConfig));
}

BOOL CGit::CheckCleanWorkTree()
{
        CString out;
        CString cmd;
        cmd=_T("git.exe rev-parse --verify HEAD");

        if(Run(cmd,&out,CP_UTF8))
                return FALSE;

        cmd=_T("git.exe update-index --ignore-submodules --refresh");
        if(Run(cmd,&out,CP_UTF8))
                return FALSE;

        cmd=_T("git.exe diff-files --quiet --ignore-submodules");
        if(Run(cmd,&out,CP_UTF8))
                return FALSE;

        cmd = _T("git.exe diff-index --cached --quiet HEAD --ignore-submodules --");
        if(Run(cmd,&out,CP_UTF8))
                return FALSE;

        return TRUE;
}
int CGit::Revert(const CString& commit, const CTGitPathList &list, bool)
{
        int ret;
        for (int i = 0; i < list.GetCount(); ++i)
        {
                ret = Revert(commit, (CTGitPath&)list[i]);
                if(ret)
                        return ret;
        }
        return 0;
}
int CGit::Revert(const CString& commit, const CTGitPath &path)
{
        CString cmd, out;

        if(path.m_Action & CTGitPath::LOGACTIONS_REPLACED && !path.GetGitOldPathString().IsEmpty())
        {
                if (CTGitPath(path.GetGitOldPathString()).IsDirectory())
                {
                        CString err;
                        err.Format(_T("Cannot revert renaming of \"%s\". A directory with the old name \"%s\" exists."), path.GetGitPathString(), path.GetGitOldPathString());
                        ::MessageBox(NULL, err, _T("TortoiseGit"), MB_OK|MB_ICONERROR);
                        return -1;
                }
                CString force;
                // if the filenames only differ in case, we have to pass "-f"
                if (path.GetGitPathString().CompareNoCase(path.GetGitOldPathString()) == 0)
                        force = _T("-f ");
                cmd.Format(_T("git.exe mv %s-- \"%s\" \"%s\""), force, path.GetGitPathString(), path.GetGitOldPathString());
                if (Run(cmd, &out, CP_UTF8))
                {
                        ::MessageBox(NULL, out, _T("TortoiseGit"), MB_OK|MB_ICONERROR);
                        return -1;
                }

                cmd.Format(_T("git.exe checkout %s -f -- \"%s\""), commit, path.GetGitOldPathString());
                if (Run(cmd, &out, CP_UTF8))
                {
                        ::MessageBox(NULL, out, _T("TortoiseGit"), MB_OK|MB_ICONERROR);
                        return -1;
                }

        }
        else if(path.m_Action & CTGitPath::LOGACTIONS_ADDED)
        {       //To init git repository, there are not HEAD, so we can use git reset command
                cmd.Format(_T("git.exe rm -f --cached -- \"%s\""),path.GetGitPathString());

                if (Run(cmd, &out, CP_UTF8))
                {
                        ::MessageBox(NULL, out, _T("TortoiseGit"), MB_OK|MB_ICONERROR);
                        return -1;
                }
        }
        else
        {
                cmd.Format(_T("git.exe checkout %s -f -- \"%s\""), commit, path.GetGitPathString());
                if (Run(cmd, &out, CP_UTF8))
                {
                        ::MessageBox(NULL, out, _T("TortoiseGit"), MB_OK|MB_ICONERROR);
                        return -1;
                }
        }

        if (path.m_Action & CTGitPath::LOGACTIONS_DELETED)
        {
                cmd.Format(_T("git.exe add -f -- \"%s\""), path.GetGitPathString());
                if (Run(cmd, &out, CP_UTF8))
                {
                        ::MessageBox(NULL, out, _T("TortoiseGit"), MB_OK|MB_ICONERROR);
                        return -1;
                }
        }

        return 0;
}

int CGit::ListConflictFile(CTGitPathList &list, const CTGitPath *path)
{
        BYTE_VECTOR vector;

        CString cmd;
        if(path)
                cmd.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),path->GetGitPathString());
        else
                cmd=_T("git.exe ls-files -u -t -z");

        if (Run(cmd, &vector))
        {
                return -1;
        }

        if (list.ParserFromLsFile(vector))
                return -1;

        return 0;
}

bool CGit::IsFastForward(const CString &from, const CString &to, CGitHash * commonAncestor)
{
        if (UsingLibGit2(GIT_CMD_MERGE_BASE))
        {
                CAutoRepository repo(GetGitRepository());
                if (!repo)
                        return false;

                CGitHash fromHash, toHash, baseHash;
                if (GetHash(repo, toHash, FixBranchName(to)))
                        return false;

                if (GetHash(repo, fromHash, FixBranchName(from)))
                        return false;

                git_oid baseOid;
                if (git_merge_base(&baseOid, repo, (const git_oid*)toHash.m_hash, (const git_oid*)fromHash.m_hash))
                        return false;

                baseHash = baseOid.id;

                if (commonAncestor)
                        *commonAncestor = baseHash;

                return fromHash == baseHash;
        }
        // else
        CString base;
        CGitHash basehash,hash;
        CString cmd, err;
        cmd.Format(_T("git.exe merge-base %s %s"), FixBranchName(to), FixBranchName(from));

        if (Run(cmd, &base, &err, CP_UTF8))
        {
                return false;
        }
        basehash = base.Trim();

        GetHash(hash, from);

        if (commonAncestor)
                *commonAncestor = basehash;

        return hash == basehash;
}

unsigned int CGit::Hash2int(const CGitHash &hash)
{
        int ret=0;
        for (int i = 0; i < 4; ++i)
        {
                ret = ret << 8;
                ret |= hash.m_hash[i];
        }
        return ret;
}

int CGit::RefreshGitIndex()
{
        if(g_Git.m_IsUseGitDLL)
        {
                CAutoLocker lock(g_Git.m_critGitDllSec);
                try
                {
                        return [] { return git_run_cmd("update-index","update-index -q --refresh"); }();

                }catch(...)
                {
                        return -1;
                }

        }
        else
        {
                CString cmd,output;
                cmd=_T("git.exe update-index --refresh");
                return Run(cmd, &output, CP_UTF8);
        }
}

int CGit::GetOneFile(const CString &Refname, const CTGitPath &path, const CString &outputfile)
{
        if (UsingLibGit2(GIT_CMD_GETONEFILE))
        {
                CAutoRepository repo(GetGitRepository());
                if (!repo)
                        return -1;

                CGitHash hash;
                if (GetHash(repo, hash, Refname))
                        return -1;

                CAutoCommit commit;
                if (git_commit_lookup(commit.GetPointer(), repo, (const git_oid *)hash.m_hash))
                        return -1;

                CAutoTree tree;
                if (git_commit_tree(tree.GetPointer(), commit))
                        return -1;

                CAutoTreeEntry entry;
                if (git_tree_entry_bypath(entry.GetPointer(), tree, CUnicodeUtils::GetUTF8(path.GetGitPathString())))
                        return -1;

                CAutoBlob blob;
                if (git_tree_entry_to_object((git_object**)blob.GetPointer(), repo, entry))
                        return -1;

                FILE *file = nullptr;
                _tfopen_s(&file, outputfile, _T("w"));
                if (file == nullptr)
                {
                        giterr_set_str(GITERR_NONE, "Could not create file.");
                        return -1;
                }
                CAutoBuf buf;
                if (git_blob_filtered_content(buf, blob, CUnicodeUtils::GetUTF8(path.GetGitPathString()), 0))
                {
                        fclose(file);
                        return -1;
                }
                if (fwrite(buf->ptr, sizeof(char), buf->size, file) != buf->size)
                {
                        giterr_set_str(GITERR_OS, "Could not write to file.");
                        fclose(file);

                        return -1;
                }
                fclose(file);

                return 0;
        }
        else if (g_Git.m_IsUseGitDLL)
        {
                CAutoLocker lock(g_Git.m_critGitDllSec);
                try
                {
                        g_Git.CheckAndInitDll();
                        CStringA ref, patha, outa;
                        ref = CUnicodeUtils::GetMulti(Refname, CP_UTF8);
                        patha = CUnicodeUtils::GetMulti(path.GetGitPathString(), CP_UTF8);
                        outa = CUnicodeUtils::GetMulti(outputfile, CP_UTF8);
                        ::DeleteFile(outputfile);
                        return git_checkout_file(ref, patha, outa);

                }
                catch (const char * msg)
                {
                        gitLastErr = L"gitdll.dll reports: " + CString(msg);
                        return -1;
                }
                catch (...)
                {
                        gitLastErr = L"An unknown gitdll.dll error occurred.";
                        return -1;
                }
        }
        else
        {
                CString cmd;
                cmd.Format(_T("git.exe cat-file -p %s:\"%s\""), Refname, path.GetGitPathString());
                return RunLogFile(cmd, outputfile, &gitLastErr);
        }
}
void CEnvironment::CopyProcessEnvironment()
{
        TCHAR *porig = GetEnvironmentStrings();
        TCHAR *p = porig;
        while(*p !=0 || *(p+1) !=0)
                this->push_back(*p++);

        push_back(_T('\0'));
        push_back(_T('\0'));

        FreeEnvironmentStrings(porig);
}

CString CEnvironment::GetEnv(const TCHAR *name)
{
        CString str;
        for (size_t i = 0; i < size(); ++i)
        {
                str = &(*this)[i];
                int start =0;
                CString sname = str.Tokenize(_T("="),start);
                if(sname.CompareNoCase(name) == 0)
                {
                        return &(*this)[i+start];
                }
                i+=str.GetLength();
        }
        return _T("");
}

void CEnvironment::SetEnv(const TCHAR *name, const TCHAR* value)
{
        unsigned int i;
        for (i = 0; i < size(); ++i)
        {
                CString str = &(*this)[i];
                int start =0;
                CString sname = str.Tokenize(_T("="),start);
                if(sname.CompareNoCase(name) == 0)
                {
                        break;
                }
                i+=str.GetLength();
        }

        if(i == size())
        {
                i -= 1; // roll back terminate \0\0
                this->push_back(_T('\0'));
        }

        CEnvironment::iterator it;
        it=this->begin();
        it += i;

        while(*it && i<size())
        {
                this->erase(it);
                it=this->begin();
                it += i;
        }

        while(*name)
        {
                this->insert(it,*name++);
                ++i;
                it= begin()+i;
        }

        this->insert(it, _T('='));
        ++i;
        it= begin()+i;

        while(*value)
        {
                this->insert(it,*value++);
                ++i;
                it= begin()+i;
        }

}

int CGit::GetGitEncode(TCHAR* configkey)
{
        CString str=GetConfigValue(configkey);

        if(str.IsEmpty())
                return CP_UTF8;

        return CUnicodeUtils::GetCPCode(str);
}


int CGit::GetDiffPath(CTGitPathList *PathList, CGitHash *hash1, CGitHash *hash2, char *arg)
{
        GIT_FILE file=0;
        int ret=0;
        GIT_DIFF diff=0;

        CAutoLocker lock(g_Git.m_critGitDllSec);

        if(arg == NULL)
                diff = GetGitDiff();
        else
                git_open_diff(&diff, arg);

        if(diff ==NULL)
                return -1;

        bool isStat = 0;
        if(arg == NULL)
                isStat = true;
        else
                isStat = !!strstr(arg, "stat");

        int count=0;

        if(hash2 == NULL)
                ret = git_root_diff(diff, hash1->m_hash, &file, &count,isStat);
        else
                ret = git_do_diff(diff,hash2->m_hash,hash1->m_hash,&file,&count,isStat);

        if(ret)
                return -1;

        CTGitPath path;
        CString strnewname;
        CString stroldname;

        for (int j = 0; j < count; ++j)
        {
                path.Reset();
                char *newname;
                char *oldname;

                strnewname.Empty();
                stroldname.Empty();

                int mode=0,IsBin=0,inc=0,dec=0;
                git_get_diff_file(diff,file,j,&newname,&oldname,
                                        &mode,&IsBin,&inc,&dec);

                StringAppend(&strnewname, (BYTE*)newname, CP_UTF8);
                StringAppend(&stroldname, (BYTE*)oldname, CP_UTF8);

                path.SetFromGit(strnewname,&stroldname);
                path.ParserAction((BYTE)mode);

                if(IsBin)
                {
                        path.m_StatAdd=_T("-");
                        path.m_StatDel=_T("-");
                }
                else
                {
                        path.m_StatAdd.Format(_T("%d"),inc);
                        path.m_StatDel.Format(_T("%d"),dec);
                }
                PathList->AddPath(path);
        }
        git_diff_flush(diff);

        if(arg)
                git_close_diff(diff);

        return 0;
}

int CGit::GetShortHASHLength() const
{
        return 7;
}

CString CGit::GetShortName(const CString& ref, REF_TYPE *out_type)
{
        CString str=ref;
        CString shortname;
        REF_TYPE type = CGit::UNKNOWN;

        if (CGit::GetShortName(str, shortname, _T("refs/heads/")))
        {
                type = CGit::LOCAL_BRANCH;

        }
        else if (CGit::GetShortName(str, shortname, _T("refs/remotes/")))
        {
                type = CGit::REMOTE_BRANCH;
        }
        else if (CGit::GetShortName(str, shortname, _T("refs/tags/")))
        {
                type = CGit::TAG;
        }
        else if (CGit::GetShortName(str, shortname, _T("refs/stash")))
        {
                type = CGit::STASH;
                shortname=_T("stash");
        }
        else if (CGit::GetShortName(str, shortname, _T("refs/bisect/")))
        {
                if (shortname.Find(_T("good")) == 0)
                {
                        type = CGit::BISECT_GOOD;
                        shortname = _T("good");
                }

                if (shortname.Find(_T("bad")) == 0)
                {
                        type = CGit::BISECT_BAD;
                        shortname = _T("bad");
                }
        }
        else if (CGit::GetShortName(str, shortname, _T("refs/notes/")))
        {
                type = CGit::NOTES;
        }
        else if (CGit::GetShortName(str, shortname, _T("refs/")))
        {
                type = CGit::UNKNOWN;
        }
        else
        {
                type = CGit::UNKNOWN;
                shortname = ref;
        }

        if(out_type)
                *out_type = type;

        return shortname;
}

bool CGit::UsingLibGit2(LIBGIT2_CMD cmd) const
{
        return m_IsUseLibGit2 && ((1 << cmd) & m_IsUseLibGit2_mask) ? true : false;
}

CString CGit::GetUnifiedDiffCmd(const CTGitPath& path, const git_revnum_t& rev1, const git_revnum_t& rev2, bool bMerge, bool bCombine, int diffContext)
{
        CString cmd;
        if (rev2 == GitRev::GetWorkingCopy())
                cmd.Format(_T("git.exe diff --stat -p %s --"), rev1);
        else if (rev1 == GitRev::GetWorkingCopy())
                cmd.Format(_T("git.exe diff -R --stat -p %s --"), rev2);
        else
        {
                CString merge;
                if (bMerge)
                        merge += _T(" -m");

                if (bCombine)
                        merge += _T(" -c");

                CString unified;
                if (diffContext > 0)
                        unified.Format(_T(" --unified=%d"), diffContext);
                cmd.Format(_T("git.exe diff-tree -r -p %s %s --stat %s %s --"), merge, unified, rev1, rev2);
        }

        if (!path.IsEmpty())
        {
                cmd += _T(" \"");
                cmd += path.GetGitPathString();
                cmd += _T("\"");
        }

        return cmd;
}

static int UnifiedDiffToFile(const git_diff_delta * /* delta */, const git_diff_hunk * /* hunk */, const git_diff_line * line, void *payload)
{
        ATLASSERT(payload && line);
        if (line->origin == GIT_DIFF_LINE_CONTEXT || line->origin == GIT_DIFF_LINE_ADDITION || line->origin == GIT_DIFF_LINE_DELETION)
                fwrite(&line->origin, 1, 1, (FILE *)payload);
        fwrite(line->content, 1, line->content_len, (FILE *)payload);
        return 0;
}

static int resolve_to_tree(git_repository *repo, const char *identifier, git_tree **tree)
{
        ATLASSERT(repo && identifier && tree);

        /* try to resolve identifier */
        CAutoObject obj;
        if (git_revparse_single(obj.GetPointer(), repo, identifier))
                return -1;

        if (obj == nullptr)
                return GIT_ENOTFOUND;

        int err = 0;
        switch (git_object_type(obj))
        {
        case GIT_OBJ_TREE:
                *tree = (git_tree *)obj.Detach();
                break;
        case GIT_OBJ_COMMIT:
                err = git_commit_tree(tree, (git_commit *)(git_object*)obj);
                break;
        default:
                err = GIT_ENOTFOUND;
        }

        return err;
}

/* use libgit2 get unified diff */
static int GetUnifiedDiffLibGit2(const CTGitPath& path, const git_revnum_t& revOld, const git_revnum_t& revNew, git_diff_line_cb callback, void *data, bool /* bMerge */)
{
        CStringA tree1 = CUnicodeUtils::GetMulti(revNew, CP_UTF8);
        CStringA tree2 = CUnicodeUtils::GetMulti(revOld, CP_UTF8);

        CAutoRepository repo(g_Git.GetGitRepository());
        if (!repo)
                return -1;

        int isHeadOrphan = git_repository_head_unborn(repo);
        if (isHeadOrphan == 1)
                return 0;
        else if (isHeadOrphan != 0)
                return -1;

        git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
        CStringA pathA = CUnicodeUtils::GetMulti(path.GetGitPathString(), CP_UTF8);
        char *buf = pathA.GetBuffer();
        if (!pathA.IsEmpty())
        {
                opts.pathspec.strings = &buf;
                opts.pathspec.count = 1;
        }
        CAutoDiff diff;

        if (revNew == GitRev::GetWorkingCopy() || revOld == GitRev::GetWorkingCopy())
        {
                CAutoTree t1;
                CAutoDiff diff2;

                if (revNew != GitRev::GetWorkingCopy() && resolve_to_tree(repo, tree1, t1.GetPointer()))
                        return -1;

                if (revOld != GitRev::GetWorkingCopy() && resolve_to_tree(repo, tree2, t1.GetPointer()))
                        return -1;

                if (git_diff_tree_to_index(diff.GetPointer(), repo, t1, nullptr, &opts))
                        return -1;

                if (git_diff_index_to_workdir(diff2.GetPointer(), repo, nullptr, &opts)) 
                        return -1;

                if (git_diff_merge(diff, diff2)) 
                        return -1;
        }
        else
        {
                if (tree1.IsEmpty() && tree2.IsEmpty())
                        return -1;

                if (tree1.IsEmpty())
                {
                        tree1 = tree2;
                        tree2.Empty();
                }

                CAutoTree t1;
                CAutoTree t2;
                if (!tree1.IsEmpty() && resolve_to_tree(repo, tree1, t1.GetPointer()))
                        return -1;

                if (tree2.IsEmpty())
                {
                        /* don't check return value, there are not parent commit at first commit*/
                        resolve_to_tree(repo, tree1 + "~1", t2.GetPointer());
                }
                else if (resolve_to_tree(repo, tree2, t2.GetPointer()))
                        return -1;
                if (git_diff_tree_to_tree(diff.GetPointer(), repo, t2, t1, &opts))
                        return -1;
        }

        for (size_t i = 0; i < git_diff_num_deltas(diff); ++i)
        {
                CAutoPatch patch;
                if (git_patch_from_diff(patch.GetPointer(), diff, i))
                        return -1;

                if (git_patch_print(patch, callback, data))
                        return -1;
        }

        pathA.ReleaseBuffer();

        return 0;
}

int CGit::GetUnifiedDiff(const CTGitPath& path, const git_revnum_t& rev1, const git_revnum_t& rev2, CString patchfile, bool bMerge, bool bCombine, int diffContext)
{
        if (UsingLibGit2(GIT_CMD_DIFF))
        {
                FILE *file = nullptr;
                _tfopen_s(&file, patchfile, _T("w"));
                if (file == nullptr)
                        return -1;
                int ret = GetUnifiedDiffLibGit2(path, rev1, rev2, UnifiedDiffToFile, file, bMerge);
                fclose(file);
                return ret;
        }
        else
        {
                CString cmd;
                cmd = GetUnifiedDiffCmd(path, rev1, rev2, bMerge, bCombine, diffContext);
                return RunLogFile(cmd, patchfile, &gitLastErr);
        }
}

static int UnifiedDiffToStringA(const git_diff_delta * /*delta*/, const git_diff_hunk * /*hunk*/, const git_diff_line *line, void *payload)
{
        ATLASSERT(payload && line);
        CStringA *str = (CStringA*) payload;
        if (line->origin == GIT_DIFF_LINE_CONTEXT || line->origin == GIT_DIFF_LINE_ADDITION || line->origin == GIT_DIFF_LINE_DELETION)
                str->Append(&line->origin, 1);
        str->Append(line->content, (int)line->content_len);
        return 0;
}

int CGit::GetUnifiedDiff(const CTGitPath& path, const git_revnum_t& rev1, const git_revnum_t& rev2, CStringA * buffer, bool bMerge, bool bCombine, int diffContext)
{
        if (UsingLibGit2(GIT_CMD_DIFF))
                return GetUnifiedDiffLibGit2(path, rev1, rev2, UnifiedDiffToStringA, buffer, bMerge);
        else
        {
                CString cmd;
                cmd = GetUnifiedDiffCmd(path, rev1, rev2, bMerge, bCombine, diffContext);
                BYTE_VECTOR vector;
                int ret = Run(cmd, &vector);
                if (!vector.empty())
                {
                        vector.push_back(0); // vector is not NUL terminated
                        buffer->Append((char *)&vector[0]);
                }
                return ret;
        }
}

int CGit::GitRevert(int parent, const CGitHash &hash)
{
        if (UsingLibGit2(GIT_CMD_REVERT))
        {
                CAutoRepository repo(GetGitRepository());
                if (!repo)
                        return -1;

                CAutoCommit commit;
                if (git_commit_lookup(commit.GetPointer(), repo, (const git_oid *)hash.m_hash))
                        return -1;

                git_revert_options revert_opts = GIT_REVERT_OPTIONS_INIT;
                revert_opts.mainline = parent;
                int result = git_revert(repo, commit, &revert_opts);

                return !result ? 0 : -1;
        }
        else
        {
                CString cmd, merge;
                if (parent)
                        merge.Format(_T("-m %d "), parent);
                cmd.Format(_T("git.exe revert --no-edit --no-commit %s%s"), merge, hash.ToString());
                gitLastErr = cmd + _T("\n");
                if (Run(cmd, &gitLastErr, CP_UTF8))
                {
                        return -1;
                }
                else
                {
                        gitLastErr.Empty();
                        return 0;
                }
        }
}

int CGit::DeleteRef(const CString& reference)
{
        if (UsingLibGit2(GIT_CMD_DELETETAGBRANCH))
        {
                CAutoRepository repo(GetGitRepository());
                if (!repo)
                        return -1;

                CStringA refA;
                if (reference.Right(3) == _T("^{}"))
                        refA = CUnicodeUtils::GetUTF8(reference.Left(reference.GetLength() - 3));
                else
                        refA = CUnicodeUtils::GetUTF8(reference);

                CAutoReference ref;
                if (git_reference_lookup(ref.GetPointer(), repo, refA))
                        return -1;

                int result = -1;
                if (git_reference_is_tag(ref))
                        result = git_tag_delete(repo, git_reference_shorthand(ref));
                else if (git_reference_is_branch(ref))
                        result = git_branch_delete(ref);
                else if (git_reference_is_remote(ref))
                        result = git_branch_delete(ref);
                else
                        giterr_set_str(GITERR_REFERENCE, CUnicodeUtils::GetUTF8(L"unsupported reference type: " + reference));

                return result;
        }
        else
        {
                CString cmd, shortname;
                if (GetShortName(reference, shortname, _T("refs/heads/")))
                        cmd.Format(_T("git.exe branch -D -- %s"), shortname);
                else if (GetShortName(reference, shortname, _T("refs/tags/")))
                        cmd.Format(_T("git.exe tag -d -- %s"), shortname);
                else if (GetShortName(reference, shortname, _T("refs/remotes/")))
                        cmd.Format(_T("git.exe branch -r -D -- %s"), shortname);
                else
                {
                        gitLastErr = L"unsupported reference type: " + reference;
                        return -1;
                }

                if (Run(cmd, &gitLastErr, CP_UTF8))
                        return -1;

                gitLastErr.Empty();
                return 0;
        }
}

bool CGit::LoadTextFile(const CString &filename, CString &msg)
{
        if (PathFileExists(filename))
        {
                FILE *pFile = nullptr;
                _tfopen_s(&pFile, filename, _T("r"));
                if (pFile)
                {
                        CStringA str;
                        do
                        {
                                char s[8196] = { 0 };
                                int read = (int)fread(s, sizeof(char), sizeof(s), pFile);
                                if (read == 0)
                                        break;
                                str += CStringA(s, read);
                        } while (true);
                        fclose(pFile);
                        msg = CUnicodeUtils::GetUnicode(str);
                        msg.Replace(_T("\r\n"), _T("\n"));
                        msg.TrimRight(_T("\n"));
                        msg += _T("\n");
                }
                else
                        ::MessageBox(nullptr, _T("Could not open ") + filename, _T("TortoiseGit"), MB_ICONERROR);
                return true; // load no further files
        }
        return false;
}