From f42f4555820b0f539e0acec63f675690ce9fd418 Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Sat, 11 Oct 2014 16:27:25 +0200
Subject: [PATCH] Update libgit2

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
---
 ext/build/libgit2.vcxproj                                  | 2 ++
 ext/build/libgit2.vcxproj.filters                          | 6 ++++++
 ext/libgit2                                                | 2 +-
 src/TortoiseProc/ProgressCommands/ResetProgressCommand.cpp | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ext/build/libgit2.vcxproj b/ext/build/libgit2.vcxproj
index 1439f2532..c8331a6a4 100644
--- a/ext/build/libgit2.vcxproj
+++ b/ext/build/libgit2.vcxproj
@@ -82,6 +82,7 @@
     <ClCompile Include="..\libgit2\src\date.c" />
     <ClCompile Include="..\libgit2\src\delta-apply.c" />
     <ClCompile Include="..\libgit2\src\delta.c" />
+    <ClCompile Include="..\libgit2\src\describe.c" />
     <ClCompile Include="..\libgit2\src\diff.c" />
     <ClCompile Include="..\libgit2\src\diff_driver.c" />
     <ClCompile Include="..\libgit2\src\diff_file.c" />
@@ -200,6 +201,7 @@
     <ClInclude Include="..\libgit2\include\git2\buffer.h" />
     <ClInclude Include="..\libgit2\include\git2\cherrypick.h" />
     <ClInclude Include="..\libgit2\include\git2\cred_helpers.h" />
+    <ClInclude Include="..\libgit2\include\git2\describe.h" />
     <ClInclude Include="..\libgit2\include\git2\filter.h" />
     <ClInclude Include="..\libgit2\include\git2\graph.h" />
     <ClInclude Include="..\libgit2\include\git2\merge.h" />
diff --git a/ext/build/libgit2.vcxproj.filters b/ext/build/libgit2.vcxproj.filters
index 3999f331b..01cd01c8e 100644
--- a/ext/build/libgit2.vcxproj.filters
+++ b/ext/build/libgit2.vcxproj.filters
@@ -452,6 +452,9 @@
     <ClCompile Include="..\libgit2\src\transaction.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\libgit2\src\describe.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\libgit2\src\attr.h">
@@ -1012,6 +1015,9 @@
     <ClInclude Include="..\libgit2\include\git2\transaction.h">
       <Filter>Public Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\libgit2\include\git2\describe.h">
+      <Filter>Public Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\libgit2\src\win32\git2.rc">
diff --git a/ext/libgit2 b/ext/libgit2
index dfff1b5bc..a6ed1fcbe 160000
--- a/ext/libgit2
+++ b/ext/libgit2
@@ -1 +1 @@
-Subproject commit dfff1b5bcb632c4e135c9f7d1edaa9afd4fd962f
+Subproject commit a6ed1fcbe1dbd78dbfd83da3dcff12ed37134e96
diff --git a/src/TortoiseProc/ProgressCommands/ResetProgressCommand.cpp b/src/TortoiseProc/ProgressCommands/ResetProgressCommand.cpp
index 5c4e4b19b..bcb2846dc 100644
--- a/src/TortoiseProc/ProgressCommands/ResetProgressCommand.cpp
+++ b/src/TortoiseProc/ProgressCommands/ResetProgressCommand.cpp
@@ -47,7 +47,7 @@ bool ResetProgressCommand::Run(CGitProgressList* list, CString& sWindowTitle, in
 	CAutoObject target;
 	if (git_revparse_single(target.GetPointer(), repo, CUnicodeUtils::GetUTF8(m_revision)))
 		goto error;
-	if (git_reset(repo, target, (git_reset_t)(m_resetType + 1), nullptr, nullptr))
+	if (git_reset(repo, target, (git_reset_t)(m_resetType + 1), nullptr, nullptr, nullptr))
 		goto error;
 
 	// Not setting m_PostCmdCallback here, as clone is only called from AppUtils.cpp
-- 
2.11.4.GIT