test/UnitTests/resources/patches/git-format-patch-no-prefix.patch

   1 From cf6938703026288086c1892937b3914e4feef678 Mon Sep 17 00:00:00 2001
   2 From: Sven Strickroth <email@cs-ware.de>
   3 Date: Wed, 29 Aug 2018 22:29:34 +0200
   4 Subject: [PATCH] Show correct log
   5
   6 When there is a submodule conflict on Edit conflict -> Use this -> "..." (pick commit) the log of the superproject was shown.
   7
   8 Signed-off-by: Sven Strickroth <email@cs-ware.de>
   9 ---
  10  src/TortoiseProc/AppUtils.cpp | 3 +++
  11  1 file changed, 3 insertions(+)
  12
  13 diff --git src/TortoiseProc/AppUtils.cpp src/TortoiseProc/AppUtils.cpp
  14 index fe40643e9..f74cfec7e 100644
  15 --- src/TortoiseProc/AppUtils.cpp
  16 +++ src/TortoiseProc/AppUtils.cpp
  17 @@ -3704,12 +3704,15 @@ int CAppUtils::ResolveConflict(HWND hWnd, CTGitPath& path, resolve_with resolveW
  18                                 {
  19                                         CString origPath = g_Git.m_CurrentDir;
  20                                         g_Git.m_CurrentDir = g_Git.CombinePath(path);
  21 +                                       SetCurrentDirectory(g_Git.m_CurrentDir);
  22                                         if (!GitReset(hWnd, &hash))
  23                                         {
  24                                                 g_Git.m_CurrentDir = origPath;
  25 +                                               SetCurrentDirectory(g_Git.m_CurrentDir);
  26                                                 return -1;
  27                                         }
  28                                         g_Git.m_CurrentDir = origPath;
  29 +                                       SetCurrentDirectory(g_Git.m_CurrentDir);
  30                                 }
  31                         }
  32                         else
  33 --
  34 2.18.0.windows.1
  35