From f9d6ffc2fa693bbad69e31a69b8922df5e70c7f8 Mon Sep 17 00:00:00 2001
From: Sup Yut Sum <ch3cooli@gmail.com>
Date: Fri, 28 Feb 2014 22:55:55 +0800
Subject: [PATCH] Updated libgit 1.9.0

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 ext/build/libgit.vcxproj         |  2 +-
 ext/build/libgit.vcxproj.filters |  6 +++---
 ext/gitdll/gitdll.c              | 28 ++++++++++++++++++----------
 ext/tgit                         |  2 +-
 src/Changelog.txt                |  1 +
 5 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/ext/build/libgit.vcxproj b/ext/build/libgit.vcxproj
index 669096bf9..f70dfe9f0 100644
--- a/ext/build/libgit.vcxproj
+++ b/ext/build/libgit.vcxproj
@@ -47,6 +47,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\tgit\builtin\check-mailmap.c" />
+    <ClCompile Include="..\tgit\builtin\get-tar-commit-id.c" />
     <ClCompile Include="..\tgit\builtin\repack.c" />
     <ClCompile Include="..\tgit\compat\msvc.c" />
     <ClCompile Include="..\tgit\block-sha1\sha1.c" />
@@ -333,7 +334,6 @@
     <ClCompile Include="..\tgit\builtin\tag.c">
       <ObjectFileName>$(IntDir)BuildIn%(Filename).obj</ObjectFileName>
     </ClCompile>
-    <ClCompile Include="..\tgit\builtin\tar-tree.c" />
     <ClCompile Include="..\tgit\builtin\unpack-file.c" />
     <ClCompile Include="..\tgit\builtin\unpack-objects.c" />
     <ClCompile Include="..\tgit\builtin\update-index.c" />
diff --git a/ext/build/libgit.vcxproj.filters b/ext/build/libgit.vcxproj.filters
index 909d21f14..d9a1799fc 100644
--- a/ext/build/libgit.vcxproj.filters
+++ b/ext/build/libgit.vcxproj.filters
@@ -728,9 +728,6 @@
     <ClCompile Include="..\tgit\builtin\tag.c">
       <Filter>BuildIn</Filter>
     </ClCompile>
-    <ClCompile Include="..\tgit\builtin\tar-tree.c">
-      <Filter>BuildIn</Filter>
-    </ClCompile>
     <ClCompile Include="..\tgit\builtin\unpack-file.c">
       <Filter>BuildIn</Filter>
     </ClCompile>
@@ -803,6 +800,9 @@
     <ClCompile Include="..\tgit\builtin\repack.c">
       <Filter>BuildIn</Filter>
     </ClCompile>
+    <ClCompile Include="..\tgit\builtin\get-tar-commit-id.c">
+      <Filter>BuildIn</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\tgit\compat\msvc.h">
diff --git a/ext/gitdll/gitdll.c b/ext/gitdll/gitdll.c
index 8f75546c1..6854a90d2 100644
--- a/ext/gitdll/gitdll.c
+++ b/ext/gitdll/gitdll.c
@@ -697,13 +697,6 @@ const char git_usage_string[] =
 const char git_more_info_string[] =
 	"See 'git help COMMAND' for more information on a specific command.";
 
-int git_run_cmd(char *cmd, char *arg)
-{
-
-	int i=0;
-	char ** argv=0;
-	int argc=0;
-
 static struct cmd_struct commands[] = {
 		{ "add", cmd_add, RUN_SETUP | NEED_WORK_TREE },
 		{ "stage", cmd_add, RUN_SETUP | NEED_WORK_TREE },
@@ -773,7 +766,6 @@ static struct cmd_struct commands[] = {
 		{ "pack-objects", cmd_pack_objects, RUN_SETUP },
 		{ "pack-redundant", cmd_pack_redundant, RUN_SETUP },
 		{ "patch-id", cmd_patch_id },
-		{ "peek-remote", cmd_ls_remote },
 		{ "pickaxe", cmd_blame, RUN_SETUP },
 		{ "prune", cmd_prune, RUN_SETUP },
 		{ "prune-packed", cmd_prune_packed, RUN_SETUP },
@@ -783,7 +775,6 @@ static struct cmd_struct commands[] = {
 		{ "reflog", cmd_reflog, RUN_SETUP },
 		{ "remote", cmd_remote, RUN_SETUP },
 		{ "replace", cmd_replace, RUN_SETUP },
-		{ "repo-config", cmd_config },
 		{ "rerere", cmd_rerere, RUN_SETUP },
 		{ "reset", cmd_reset, RUN_SETUP },
 		{ "rev-list", cmd_rev_list, RUN_SETUP },
@@ -798,7 +789,6 @@ static struct cmd_struct commands[] = {
 		{ "stripspace", cmd_stripspace },
 		{ "symbolic-ref", cmd_symbolic_ref, RUN_SETUP },
 		{ "tag", cmd_tag, RUN_SETUP },
-		{ "tar-tree", cmd_tar_tree },
 		{ "unpack-file", cmd_unpack_file, RUN_SETUP },
 		{ "unpack-objects", cmd_unpack_objects, RUN_SETUP },
 		{ "update-index", cmd_update_index, RUN_SETUP },
@@ -815,6 +805,24 @@ static struct cmd_struct commands[] = {
 		{ "pack-refs", cmd_pack_refs, RUN_SETUP },
 	};
 
+int is_builtin(const char *s)
+{
+	int i;
+	for (i = 0; i < ARRAY_SIZE(commands); i++) {
+		struct cmd_struct *p = commands+i;
+		if (!strcmp(s, p->cmd))
+			return 1;
+	}
+	return 0;
+}
+
+int git_run_cmd(char *cmd, char *arg)
+{
+
+	int i=0;
+	char ** argv=0;
+	int argc=0;
+
 	git_init();
 
 	for(i=0;i<	sizeof(commands) / sizeof(struct cmd_struct);i++)
diff --git a/ext/tgit b/ext/tgit
index 45ac147b2..dcd1f324b 160000
--- a/ext/tgit
+++ b/ext/tgit
@@ -1 +1 @@
-Subproject commit 45ac147b2c2910f0f00be57c464894f1ecc5a54e
+Subproject commit dcd1f324bac3eb59cd1dc52e746ddf3cf8eeba0b
diff --git a/src/Changelog.txt b/src/Changelog.txt
index 540088961..6deeba751 100644
--- a/src/Changelog.txt
+++ b/src/Changelog.txt
@@ -7,6 +7,7 @@ Released: Unreleased
  * Fixed issue #1029: Add function to control the TGitCache module
  * Fixed issue #2112: Disable option for Drag & Drop Handler
  * Fixed issue #2114: Allow to swap rebase refs
+ * Updated libgit to version 1.9.0
 
 == Bug Fixes ==
  * Fixed issue #2067: Normalize email with capital letters when calculating gravatar hash
-- 
2.11.4.GIT