From aca3b0ff8b7fa45aaca3f7338363901e47c8c1a4 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Thu, 2 Jan 2014 14:23:40 +0100 Subject: [PATCH] Minor cleanup Signed-off-by: Sven Strickroth --- src/TortoiseShell/ContextMenu.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/TortoiseShell/ContextMenu.cpp b/src/TortoiseShell/ContextMenu.cpp index 33cacceed..81e9c564f 100644 --- a/src/TortoiseShell/ContextMenu.cpp +++ b/src/TortoiseShell/ContextMenu.cpp @@ -1,7 +1,7 @@ // TortoiseGit - a Windows shell extension for easy version control // Copyright (C) 2003-2012 - TortoiseSVN -// Copyright (C) 2008-2013 - TortoiseGit +// 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 @@ -553,7 +553,7 @@ void CShellExt::InsertGitMenu(BOOL istop, HMENU menu, UINT pos, UINT_PTR id, UIN } } _tcscat_s(menutextbuffer, 255, stringtablebuffer); -#if 1 + // insert branch name into "Git Commit..." entry, so it looks like "Git Commit "master"..." // so we have an easy and fast way to check the current branch // (the other alternative is using a separate disabled menu entry, the code is already done but commented out) @@ -628,7 +628,7 @@ void CShellExt::InsertGitMenu(BOOL istop, HMENU menu, UINT pos, UINT_PTR id, UIN wcscpy_s(menutextbuffer, sMenu); } } -#endif + MENUITEMINFO menuiteminfo; SecureZeroMemory(&menuiteminfo, sizeof(menuiteminfo)); menuiteminfo.cbSize = sizeof(menuiteminfo); @@ -1225,7 +1225,7 @@ STDMETHODIMP CShellExt::InvokeCommand_Wrap(LPCMINVOKECOMMANDINFO lpcmi) tstring tortoiseProcPath = CPathUtils::GetAppDirectory(g_hmodThisDll) + _T("TortoiseGitProc.exe"); tstring tortoiseMergePath = CPathUtils::GetAppDirectory(g_hmodThisDll) + _T("TortoiseGitMerge.exe"); - //TortoiseProc expects a command line of the form: + //TortoiseGitProc expects a command line of the form: //"/command: /pathfile: /startrev: /endrev: /deletepathfile // or //"/command: /path: /startrev: /endrev: -- 2.11.4.GIT