From da0588ec671ea1302b81d84937f0d44ed103ac64 Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Wed, 8 Nov 2017 07:41:27 +0100
Subject: [PATCH] Update libgit to Git for Windows 2.15

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 ext/build/libgit.vcxproj         |  6 ++++++
 ext/build/libgit.vcxproj.filters | 18 ++++++++++++++++++
 ext/gitdll/gitdll.c              |  6 +++++-
 ext/tgit                         |  2 +-
 src/Changelog.txt                |  2 +-
 5 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/ext/build/libgit.vcxproj b/ext/build/libgit.vcxproj
index c010293d0..ab1b768e3 100644
--- a/ext/build/libgit.vcxproj
+++ b/ext/build/libgit.vcxproj
@@ -156,6 +156,7 @@
     <ClCompile Include="..\tgit\notes-utils.c" />
     <ClCompile Include="..\tgit\notes.c" />
     <ClCompile Include="..\tgit\object.c" />
+    <ClCompile Include="..\tgit\oidmap.c" />
     <ClCompile Include="..\tgit\oidset.c" />
     <ClCompile Include="..\tgit\pack-bitmap-write.c" />
     <ClCompile Include="..\tgit\pack-bitmap.c" />
@@ -163,6 +164,7 @@
     <ClCompile Include="..\tgit\pack-objects.c" />
     <ClCompile Include="..\tgit\pack-revindex.c" />
     <ClCompile Include="..\tgit\pack-write.c" />
+    <ClCompile Include="..\tgit\packfile.c" />
     <ClCompile Include="..\tgit\pager.c" />
     <ClCompile Include="..\tgit\parse-options-cb.c" />
     <ClCompile Include="..\tgit\parse-options.c" />
@@ -183,6 +185,7 @@
     <ClCompile Include="..\tgit\refs.c" />
     <ClCompile Include="..\tgit\refs\files-backend.c" />
     <ClCompile Include="..\tgit\refs\iterator.c" />
+    <ClCompile Include="..\tgit\refs\packed-backend.c" />
     <ClCompile Include="..\tgit\refs\ref-cache.c" />
     <ClCompile Include="..\tgit\remote.c" />
     <ClCompile Include="..\tgit\replace_object.c" />
@@ -437,11 +440,13 @@
     <ClInclude Include="..\tgit\notes-utils.h" />
     <ClInclude Include="..\tgit\notes.h" />
     <ClInclude Include="..\tgit\object.h" />
+    <ClInclude Include="..\tgit\oidmap.h" />
     <ClInclude Include="..\tgit\oidset.h" />
     <ClInclude Include="..\tgit\pack-bitmap.h" />
     <ClInclude Include="..\tgit\pack-objects.h" />
     <ClInclude Include="..\tgit\pack-revindex.h" />
     <ClInclude Include="..\tgit\pack.h" />
+    <ClInclude Include="..\tgit\packfile.h" />
     <ClInclude Include="..\tgit\parse-options.h" />
     <ClInclude Include="..\tgit\patch-ids.h" />
     <ClInclude Include="..\tgit\pathspec.h" />
@@ -453,6 +458,7 @@
     <ClInclude Include="..\tgit\ref-filter.h" />
     <ClInclude Include="..\tgit\reflog-walk.h" />
     <ClInclude Include="..\tgit\refs.h" />
+    <ClInclude Include="..\tgit\refs\packed-backend.h" />
     <ClInclude Include="..\tgit\refs\ref-cache.h" />
     <ClInclude Include="..\tgit\refs\refs-internal.h" />
     <ClInclude Include="..\tgit\remote.h" />
diff --git a/ext/build/libgit.vcxproj.filters b/ext/build/libgit.vcxproj.filters
index c3cfe97ff..7ffbde954 100644
--- a/ext/build/libgit.vcxproj.filters
+++ b/ext/build/libgit.vcxproj.filters
@@ -899,6 +899,15 @@
     <ClCompile Include="..\tgit\sub-process.c">
       <Filter>git</Filter>
     </ClCompile>
+    <ClCompile Include="..\tgit\packfile.c">
+      <Filter>git</Filter>
+    </ClCompile>
+    <ClCompile Include="..\tgit\oidmap.c">
+      <Filter>git</Filter>
+    </ClCompile>
+    <ClCompile Include="..\tgit\refs\packed-backend.c">
+      <Filter>git\refs</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\tgit\compat\msvc.h">
@@ -1277,5 +1286,14 @@
     <ClInclude Include="..\tgit\sub-process.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\tgit\packfile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\tgit\refs\packed-backend.h">
+      <Filter>git\refs</Filter>
+    </ClInclude>
+    <ClInclude Include="..\tgit\oidmap.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/ext/gitdll/gitdll.c b/ext/gitdll/gitdll.c
index e683ad346..e8c6afb87 100644
--- a/ext/gitdll/gitdll.c
+++ b/ext/gitdll/gitdll.c
@@ -28,6 +28,7 @@
 #include "cache.h"
 #include "commit.h"
 #include "diff.h"
+#include "packfile.h"
 #include "revision.h"
 #include "diffcore.h"
 #include "dir.h"
@@ -76,7 +77,10 @@ void dll_entry(void)
 
 int git_get_sha1(const char *name, GIT_HASH sha1)
 {
-	return get_sha1(name,sha1);
+	struct object_id oid = { 0 };
+	int ret = get_oid(name, &oid);
+	hashcpy(sha1, oid.hash);
+	return ret;
 }
 
 static int convert_slash(char * path)
diff --git a/ext/tgit b/ext/tgit
index 902b62ad2..713dd0b70 160000
--- a/ext/tgit
+++ b/ext/tgit
@@ -1 +1 @@
-Subproject commit 902b62ad25899ba8828ab94014fe30d13c807fd6
+Subproject commit 713dd0b700c00bc963c83957fb29320d741bc7da
diff --git a/src/Changelog.txt b/src/Changelog.txt
index a48cd112f..03ec08dac 100644
--- a/src/Changelog.txt
+++ b/src/Changelog.txt
@@ -15,7 +15,7 @@ Released: unreleased
  * Fixed issue #3036: Can not save changes in Settings -> Network after trying to add command-line option to the SSH-client
  * Fixed issue #3066: Message field needs vertical scrollbar in Create Tag dialog
  * Fixed issue #3033: Cannot view submodule log if repository sits under directory symlink
-   Update libgit to 2.14.1 based on Git for Windows source.
+   Update libgit to 2.15 based on Git for Windows source.
  * Fixed issue #3055: Explorer crash when deleting two independent folders
  * Fixed issue #3047: When Log Messages window is narrow, Filter box placeholder text may cover up the Filter Types button
  * Fixed issue #3090: Show Log window stuck with "Fetching changed files..."
-- 
2.11.4.GIT