From 2c657b3a1d28438ae62f29f9acf6e073b8f7b9ee Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Mon, 28 Mar 2016 03:00:33 +0200
Subject: [PATCH] libgit 2.7.4

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 ext/build/libgit.vcxproj         | 17 ++++++++++++++--
 ext/build/libgit.vcxproj.filters | 42 +++++++++++++++++++++++++++++++++++++---
 ext/gitdll/gitdll.c              |  6 +++---
 ext/tgit                         |  2 +-
 4 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/ext/build/libgit.vcxproj b/ext/build/libgit.vcxproj
index 29b7c1f78..3d6a59fbe 100644
--- a/ext/build/libgit.vcxproj
+++ b/ext/build/libgit.vcxproj
@@ -46,12 +46,16 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\tgit\builtin\am.c" />
     <ClCompile Include="..\tgit\builtin\check-mailmap.c" />
     <ClCompile Include="..\tgit\builtin\get-tar-commit-id.c" />
     <ClCompile Include="..\tgit\builtin\interpret-trailers.c" />
+    <ClCompile Include="..\tgit\builtin\pull.c" />
     <ClCompile Include="..\tgit\builtin\repack.c" />
     <ClCompile Include="..\tgit\builtin\verify-commit.c" />
-    <ClCompile Include="..\tgit\builtin\worktree.c" />
+    <ClCompile Include="..\tgit\builtin\worktree.c">
+      <ObjectFileName>$(IntDir)BuildIn%(Filename).obj</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\tgit\compat\msvc.c" />
     <ClCompile Include="..\tgit\block-sha1\sha1.c" />
     <ClCompile Include="..\tgit\compat\basename.c" />
@@ -71,7 +75,6 @@
     <ClCompile Include="..\tgit\compat\strtoimax.c" />
     <ClCompile Include="..\tgit\compat\strtoumax.c" />
     <ClCompile Include="..\tgit\compat\win32mmap.c" />
-    <ClCompile Include="..\tgit\compat\winansi.c" />
     <ClCompile Include="..\tgit\abspath.c" />
     <ClCompile Include="..\tgit\advice.c" />
     <ClCompile Include="..\tgit\alias.c" />
@@ -169,8 +172,10 @@
     <ClCompile Include="..\tgit\quote.c" />
     <ClCompile Include="..\tgit\reachable.c" />
     <ClCompile Include="..\tgit\read-cache.c" />
+    <ClCompile Include="..\tgit\ref-filter.c" />
     <ClCompile Include="..\tgit\reflog-walk.c" />
     <ClCompile Include="..\tgit\refs.c" />
+    <ClCompile Include="..\tgit\refs\files-backend.c" />
     <ClCompile Include="..\tgit\remote.c" />
     <ClCompile Include="..\tgit\replace_object.c" />
     <ClCompile Include="..\tgit\rerere.c" />
@@ -193,9 +198,11 @@
     <ClCompile Include="..\tgit\strbuf.c" />
     <ClCompile Include="..\tgit\streaming.c" />
     <ClCompile Include="..\tgit\string-list.c" />
+    <ClCompile Include="..\tgit\submodule-config.c" />
     <ClCompile Include="..\tgit\submodule.c" />
     <ClCompile Include="..\tgit\symlinks.c" />
     <ClCompile Include="..\tgit\tag.c" />
+    <ClCompile Include="..\tgit\tempfile.c" />
     <ClCompile Include="..\tgit\trace.c" />
     <ClCompile Include="..\tgit\transport-helper.c" />
     <ClCompile Include="..\tgit\transport.c" />
@@ -214,6 +221,7 @@
     <ClCompile Include="..\tgit\versioncmp.c" />
     <ClCompile Include="..\tgit\walker.c" />
     <ClCompile Include="..\tgit\wildmatch.c" />
+    <ClCompile Include="..\tgit\worktree.c" />
     <ClCompile Include="..\tgit\wrapper.c" />
     <ClCompile Include="..\tgit\write_or_die.c" />
     <ClCompile Include="..\tgit\ws.c" />
@@ -420,8 +428,10 @@
     <ClInclude Include="..\tgit\progress.h" />
     <ClInclude Include="..\tgit\quote.h" />
     <ClInclude Include="..\tgit\reachable.h" />
+    <ClInclude Include="..\tgit\ref-filter.h" />
     <ClInclude Include="..\tgit\reflog-walk.h" />
     <ClInclude Include="..\tgit\refs.h" />
+    <ClInclude Include="..\tgit\refs\refs-internal.h" />
     <ClInclude Include="..\tgit\remote.h" />
     <ClInclude Include="..\tgit\rerere.h" />
     <ClInclude Include="..\tgit\revision.h" />
@@ -437,8 +447,10 @@
     <ClInclude Include="..\tgit\strbuf.h" />
     <ClInclude Include="..\tgit\streaming.h" />
     <ClInclude Include="..\tgit\string-list.h" />
+    <ClInclude Include="..\tgit\submodule-config.h" />
     <ClInclude Include="..\tgit\tag.h" />
     <ClInclude Include="..\tgit\tar.h" />
+    <ClInclude Include="..\tgit\tempfile.h" />
     <ClInclude Include="..\tgit\thread-utils.h" />
     <ClInclude Include="..\tgit\transport.h" />
     <ClInclude Include="..\tgit\tree-walk.h" />
@@ -451,6 +463,7 @@
     <ClInclude Include="..\tgit\version.h" />
     <ClInclude Include="..\tgit\walker.h" />
     <ClInclude Include="..\tgit\wildmatch.h" />
+    <ClInclude Include="..\tgit\worktree.h" />
     <ClInclude Include="..\tgit\wt-status.h" />
     <ClInclude Include="..\tgit\xdiff-interface.h" />
     <ClInclude Include="..\tgit\compat\mingw.h" />
diff --git a/ext/build/libgit.vcxproj.filters b/ext/build/libgit.vcxproj.filters
index 81acc1bc0..4e7b0a5c4 100644
--- a/ext/build/libgit.vcxproj.filters
+++ b/ext/build/libgit.vcxproj.filters
@@ -27,6 +27,9 @@
     <Filter Include="Header Files\ewah">
       <UniqueIdentifier>{50d6f856-35ed-4e73-a2d1-ef4c334be249}</UniqueIdentifier>
     </Filter>
+    <Filter Include="git\refs">
+      <UniqueIdentifier>{bb065187-02fc-455a-851f-1f7109cba5ec}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\tgit\compat\msvc.c">
@@ -86,9 +89,6 @@
     <ClCompile Include="..\tgit\compat\win32mmap.c">
       <Filter>compat</Filter>
     </ClCompile>
-    <ClCompile Include="..\tgit\compat\winansi.c">
-      <Filter>compat</Filter>
-    </ClCompile>
     <ClCompile Include="..\tgit\abspath.c">
       <Filter>git</Filter>
     </ClCompile>
@@ -842,6 +842,27 @@
     <ClCompile Include="..\tgit\ewah\ewah_rlw.c">
       <Filter>git\ewah</Filter>
     </ClCompile>
+    <ClCompile Include="..\tgit\builtin\am.c">
+      <Filter>BuildIn</Filter>
+    </ClCompile>
+    <ClCompile Include="..\tgit\builtin\pull.c">
+      <Filter>BuildIn</Filter>
+    </ClCompile>
+    <ClCompile Include="..\tgit\ref-filter.c">
+      <Filter>git</Filter>
+    </ClCompile>
+    <ClCompile Include="..\tgit\submodule-config.c">
+      <Filter>git</Filter>
+    </ClCompile>
+    <ClCompile Include="..\tgit\tempfile.c">
+      <Filter>git</Filter>
+    </ClCompile>
+    <ClCompile Include="..\tgit\refs\files-backend.c">
+      <Filter>git\refs</Filter>
+    </ClCompile>
+    <ClCompile Include="..\tgit\worktree.c">
+      <Filter>git</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\tgit\compat\msvc.h">
@@ -1165,5 +1186,20 @@
     <ClInclude Include="..\tgit\ewah\ewok_rlw.h">
       <Filter>Header Files\ewah</Filter>
     </ClInclude>
+    <ClInclude Include="..\tgit\ref-filter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\tgit\submodule-config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\tgit\tempfile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\tgit\refs\refs-internal.h">
+      <Filter>git\refs</Filter>
+    </ClInclude>
+    <ClInclude Include="..\tgit\worktree.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 e8cc7362e..05271ad27 100644
--- a/ext/gitdll/gitdll.c
+++ b/ext/gitdll/gitdll.c
@@ -152,7 +152,7 @@ int git_parse_commit(GIT_COMMIT *commit)
 
 	p= (struct commit *)commit->m_pGitCommit;
 
-	memcpy(commit->m_hash,p->object.sha1,GIT_HASH_SIZE);
+	memcpy(commit->m_hash, p->object.oid.hash, GIT_HASH_SIZE);
 
 	commit->m_Encode = NULL;
 	commit->m_EncodeSize = 0;
@@ -256,7 +256,7 @@ int git_get_commit_next_parent(GIT_COMMIT_LIST *list, GIT_HASH hash)
 		return -1;
 
 	if(hash)
-		memcpy(hash, l->item->object.sha1, GIT_HASH_SIZE);
+		memcpy(hash, l->item->object.oid.hash, GIT_HASH_SIZE);
 
 	*list = (GIT_COMMIT_LIST *)l->next;
 	return 0;
@@ -1021,7 +1021,7 @@ int get_set_config(const char *key, const char *value, CONFIG_TYPE type)
 	if(!config_exclusive_filename)
 		return -1;
 
-	ret = git_config_set_multivar_in_file(config_exclusive_filename, key, value, NULL, 0);
+	ret = git_config_set_multivar_in_file_gently(config_exclusive_filename, key, value, NULL, 0);
 	free(config_exclusive_filename);
 	return ret;
 }
diff --git a/ext/tgit b/ext/tgit
index d1543192b..66d6b12f4 160000
--- a/ext/tgit
+++ b/ext/tgit
@@ -1 +1 @@
-Subproject commit d1543192b1de47638e91f9e85931bff7bfe0c18b
+Subproject commit 66d6b12f4ddde3535906dccbf009c29881b81c24
-- 
2.11.4.GIT