From 540655d6f0c2bc03eaa0f4955a612330cd5f6f8e Mon Sep 17 00:00:00 2001
From: Sup Yut Sum <ch3cooli@gmail.com>
Date: Wed, 2 Apr 2014 08:14:30 +0800
Subject: [PATCH] Updated libgit2

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
---
 ext/build/libgit2.vcxproj            |  5 +++++
 ext/build/libgit2.vcxproj.filters    | 15 +++++++++++++++
 ext/libgit2                          |  2 +-
 src/Git/Git.cpp                      |  2 +-
 src/TortoiseProc/GitProgressList.cpp |  8 ++++----
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/ext/build/libgit2.vcxproj b/ext/build/libgit2.vcxproj
index 25ad745fb..2729f070e 100644
--- a/ext/build/libgit2.vcxproj
+++ b/ext/build/libgit2.vcxproj
@@ -110,6 +110,7 @@
     <ClCompile Include="..\libgit2\src\object_api.c" />
     <ClCompile Include="..\libgit2\src\odb.c" />
     <ClCompile Include="..\libgit2\src\odb_loose.c" />
+    <ClCompile Include="..\libgit2\src\odb_mempack.c" />
     <ClCompile Include="..\libgit2\src\odb_pack.c" />
     <ClCompile Include="..\libgit2\src\oid.c" />
     <ClCompile Include="..\libgit2\src\pack-objects.c" />
@@ -139,6 +140,7 @@
     <ClCompile Include="..\libgit2\src\status.c" />
     <ClCompile Include="..\libgit2\src\strmap.c" />
     <ClCompile Include="..\libgit2\src\submodule.c" />
+    <ClCompile Include="..\libgit2\src\sysdir.c" />
     <ClCompile Include="..\libgit2\src\tag.c" />
     <ClCompile Include="..\libgit2\src\thread-utils.c" />
     <ClCompile Include="..\libgit2\src\trace.c" />
@@ -201,6 +203,7 @@
     <ClInclude Include="..\libgit2\include\git2\sys\config.h" />
     <ClInclude Include="..\libgit2\include\git2\sys\filter.h" />
     <ClInclude Include="..\libgit2\include\git2\sys\index.h" />
+    <ClInclude Include="..\libgit2\include\git2\sys\mempack.h" />
     <ClInclude Include="..\libgit2\include\git2\sys\odb_backend.h" />
     <ClInclude Include="..\libgit2\include\git2\sys\refdb_backend.h" />
     <ClInclude Include="..\libgit2\include\git2\sys\reflog.h" />
@@ -282,7 +285,9 @@
     <ClInclude Include="..\libgit2\src\sortedcache.h" />
     <ClInclude Include="..\libgit2\src\status.h" />
     <ClInclude Include="..\libgit2\src\strmap.h" />
+    <ClInclude Include="..\libgit2\src\strnlen.h" />
     <ClInclude Include="..\libgit2\src\submodule.h" />
+    <ClInclude Include="..\libgit2\src\sysdir.h" />
     <ClInclude Include="..\libgit2\src\tag.h" />
     <ClInclude Include="..\libgit2\src\thread-utils.h" />
     <ClInclude Include="..\libgit2\src\trace.h" />
diff --git a/ext/build/libgit2.vcxproj.filters b/ext/build/libgit2.vcxproj.filters
index 0f87de8d0..ddca762fc 100644
--- a/ext/build/libgit2.vcxproj.filters
+++ b/ext/build/libgit2.vcxproj.filters
@@ -410,6 +410,12 @@
     <ClCompile Include="..\libgit2\src\zstream.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\libgit2\src\sysdir.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\libgit2\src\odb_mempack.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\libgit2\src\attr.h">
@@ -919,6 +925,15 @@
     <ClInclude Include="..\libgit2\src\zstream.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\libgit2\src\strnlen.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libgit2\src\sysdir.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\libgit2\include\git2\sys\mempack.h">
+      <Filter>Public Header Files\sys</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\libgit2\src\win32\git2.rc">
diff --git a/ext/libgit2 b/ext/libgit2
index 40e10630c..f28e4c97b 160000
--- a/ext/libgit2
+++ b/ext/libgit2
@@ -1 +1 @@
-Subproject commit 40e10630cfbdddd878a6347c1751092bab7f7a28
+Subproject commit f28e4c97b38c1ec60dc6ce6e5306067ad24aeb8e
diff --git a/src/Git/Git.cpp b/src/Git/Git.cpp
index 525315637..42a5718a7 100644
--- a/src/Git/Git.cpp
+++ b/src/Git/Git.cpp
@@ -2691,7 +2691,7 @@ int CGit::GitRevert(int parent, const CGitHash &hash)
 			return -1;
 		}
 
-		git_revert_opts revert_opts = GIT_REVERT_OPTS_INIT;
+		git_revert_options revert_opts = GIT_REVERT_OPTIONS_INIT;
 		revert_opts.mainline = parent;
 		int result = git_revert(repo, commit, &revert_opts);
 
diff --git a/src/TortoiseProc/GitProgressList.cpp b/src/TortoiseProc/GitProgressList.cpp
index a7a469463..90808aa3e 100644
--- a/src/TortoiseProc/GitProgressList.cpp
+++ b/src/TortoiseProc/GitProgressList.cpp
@@ -2041,7 +2041,7 @@ bool CGitProgressList::CmdClone(CString& sWindowTitle, bool& /*localoperation*/)
 
 	git_repository *cloned_repo = NULL;
 	git_remote *origin = NULL;
-	git_checkout_opts checkout_opts = GIT_CHECKOUT_OPTS_INIT;
+	git_checkout_options checkout_opts = GIT_CHECKOUT_OPTIONS_INIT;
 
 	int error = 0;
 
@@ -2149,7 +2149,7 @@ bool CGitProgressList::CmdFetch(CString& sWindowTitle, bool& /*localoperation*/)
 		if (git_remote_load(&remote, repo, url) < 0) 
 		{
 			// retry with repository located at a specific url
-			if (git_remote_create_inmemory(&remote, repo, NULL, url) < 0)
+			if (git_remote_create_anonymous(&remote, repo, url, nullptr) < 0)
 			{
 				ReportGitError();
 				ret = false;
@@ -2201,7 +2201,7 @@ bool CGitProgressList::CmdFetch(CString& sWindowTitle, bool& /*localoperation*/)
 		// right commits. This may be needed even if there was no packfile
 		// to download, which can happen e.g. when the branches have been
 		// changed but all the neede objects are available locally.
-		if (git_remote_update_tips(remote) < 0)
+		if (git_remote_update_tips(remote, nullptr, nullptr) < 0)
 		{
 			ReportGitError();
 			ret = false;
@@ -2256,7 +2256,7 @@ bool CGitProgressList::CmdReset(CString& sWindowTitle, bool& /*localoperation*/)
 		CStringA revstr = CUnicodeUtils::GetUTF8(m_revision);
 		git_object *target;
 		git_revparse_single(&target, repo, revstr);
-		if (git_reset(repo, target, (git_reset_t)(m_resetType + 1)))
+		if (git_reset(repo, target, (git_reset_t)(m_resetType + 1), nullptr, nullptr))
 		{
 			ReportGitError();
 			ret = false;
-- 
2.11.4.GIT