Git development
 help / color / mirror / Atom feed

* Re: Failing a test on OpenServer 6 t5100-mailinfo.sh
From: Brandon Casey @ 2009-08-10 14:25 UTC (permalink / raw)
  To: Boyd Lynn Gerber; +Cc: Git List
In-Reply-To: <alpine.LNX.2.00.0908081014560.13290@suse104.zenez.com>

Boyd Lynn Gerber wrote:
> Hello,
> 
> With a config.mak.autogen that is fixed for OpenServer 6.
> 
> I now have three tests that fail.
> 
> The first is because of the OS does not allow perl to do somethings.
> 
> The second is a new problem.

Probably your system is missing support for some character encodings.

> *** t5100-mailinfo.sh ***
> *   ok 1: split sample box
> *   ok 2: mailinfo 0001
> *   ok 3: mailinfo 0002
> *   ok 4: mailinfo 0003
> *   ok 5: mailinfo 0004
> *   ok 6: mailinfo 0005
> *   ok 7: mailinfo 0006
> *   ok 8: mailinfo 0007
> *   ok 9: mailinfo 0008
> *   ok 10: mailinfo 0009
> *   ok 11: mailinfo 0010
> * FAIL 12: mailinfo 0011

This uses charset ISO8859-15.

> 
>                         git mailinfo -u msg$mail patch$mail <$mail
>> info$mail &&
>                         echo msg &&
>                         test_cmp "$TEST_DIRECTORY"/t5100/msg$mail
> msg$mail &&
>                         echo patch &&
>                         test_cmp "$TEST_DIRECTORY"/t5100/patch$mail
> patch$mail &&
>                         echo info &&
>                         test_cmp "$TEST_DIRECTORY"/t5100/info$mail
> info$mail
> 
> *   ok 13: mailinfo 0012
> *   ok 14: mailinfo 0013
> *   ok 15: split box with rfc2047 samples
> * FAIL 16: mailinfo rfc2047/0001

ISO8859-2

> *   ok 17: mailinfo rfc2047/0002
> *   ok 18: mailinfo rfc2047/0003
> * FAIL 19: mailinfo rfc2047/0004

ISO8859-8

> *   ok 20: mailinfo rfc2047/0005
> *   ok 21: mailinfo rfc2047/0006
> *   ok 22: mailinfo rfc2047/0007
> *   ok 23: mailinfo rfc2047/0008
> *   ok 24: mailinfo rfc2047/0009
> *   ok 25: mailinfo rfc2047/0010
> * FAIL 26: mailinfo rfc2047/0011

ISO8859-2

You can just skip these tests if you don't want to install the missing
encoding support.

-brandon

^ permalink raw reply

* Re: [msysGit] Using VC build git
From: Johannes Schindelin @ 2009-08-10 14:07 UTC (permalink / raw)
  To: Frank Li; +Cc: git, msysGit
In-Reply-To: <1976ea660908100656u57407131h83761329468607a8@mail.gmail.com>

Hi,

On Mon, 10 Aug 2009, Frank Li wrote:

> pull from git://repo.or.cz/tgit.git

Why the heck is this not a fork of git.git?

And did you not forget to mention which branch?

And is "git commit okay" really a sensible _full_ commit message?

Please, we have _high_ standards in git.git, and I really do not want to 
have to take anything to Junio that does not fulfill that standard.

Ciao,
Dscho

^ permalink raw reply

* Using VC build git
From: Frank Li @ 2009-08-10 13:56 UTC (permalink / raw)
  To: git, msysGit

[-- Attachment #1: Type: text/plain, Size: 36 bytes --]

pull from git://repo.or.cz/tgit.git

[-- Attachment #2: 0005-git-commit-okay.patch --]
[-- Type: application/octet-stream, Size: 1970 bytes --]

From 62b705d074a3eeffe8af5c8c0334f12ec76d1cee Mon Sep 17 00:00:00 2001
From: Frank Li <lznuaa@gmail.com>
Date: Sat, 8 Aug 2009 13:35:40 +0800
Subject: [PATCH 5/5] git commit okay

Signed-off-by: Frank Li <lznuaa@gmail.com>
---
 compat/mingw.c            |    6 +++++-
 contrib/vcbuild/porting.c |    2 +-
 editor.c                  |    2 ++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/compat/mingw.c b/compat/mingw.c
index 1cc2cb7..79cbd9f 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -275,7 +275,7 @@ int mkstemp(char *template)
 	char *filename = mktemp(template);
 	if (filename == NULL)
 		return -1;
-	return open(filename, O_RDWR | O_CREAT, 0600);
+	return _open(filename, _O_RDWR | _O_CREAT | _O_BINARY, 0600);
 }
 
 int gettimeofday(struct timeval *tv, void *tz)
@@ -1144,6 +1144,10 @@ int link(const char *oldpath, const char *newpath)
 {
 	typedef BOOL WINAPI (*T)(const char*, const char*, LPSECURITY_ATTRIBUTES);
 	static T create_hard_link = NULL;
+	
+	errno = ENOSYS;
+	return -1;
+
 	if (!create_hard_link) {
 		create_hard_link = (T) GetProcAddress(
 			GetModuleHandle("kernel32.dll"), "CreateHardLinkA");
diff --git a/contrib/vcbuild/porting.c b/contrib/vcbuild/porting.c
index 0625bb4..cf83efc 100644
--- a/contrib/vcbuild/porting.c
+++ b/contrib/vcbuild/porting.c
@@ -10,7 +10,7 @@ int snprintf(char *buff,int size, char *fmt, ...)
 	int n;
 	va_list pArgList;
 	va_start(pArgList,fmt);
-	n=_snprintf(buff,size-1,fmt,pArgList);
+	n=_vsnprintf(buff,size-1,fmt,pArgList);
 	va_end(pArgList);
 	return n;
 }
diff --git a/editor.c b/editor.c
index 4d469d0..a9a3b7c 100644
--- a/editor.c
+++ b/editor.c
@@ -13,6 +13,8 @@ int launch_editor(const char *path, struct strbuf *buffer, const char *const *en
 		editor = getenv("VISUAL");
 	if (!editor)
 		editor = getenv("EDITOR");
+	if (!editor)
+		editor = "notepad2";
 
 	terminal = getenv("TERM");
 	if (!editor && (!terminal || !strcmp(terminal, "dumb")))
-- 
1.6.4.msysgit.0


[-- Attachment #3: 0001-build-git-library.patch --]
[-- Type: application/octet-stream, Size: 58215 bytes --]

From 5352796e16d5781613968dc4fcf74ad5e3d7306d Mon Sep 17 00:00:00 2001
From: Frank Li <lznuaa@gmail.com>
Date: Wed, 5 Aug 2009 12:51:46 +0800
Subject: [PATCH 1/5] build git library

---
 builtin-fast-export.c                |    1 +
 compat/fopen.c                       |    1 +
 compat/mingw.c                       |    4 +-
 compat/mingw.h                       |    9 +-
 contrib/vcbuild/include/unistd.h     |    8 +-
 contrib/vcbuild/libgit/libgit.vcproj | 2688 +++++++++++++++++-----------------
 contrib/vcbuild/vcbuild.sln          |   29 +
 help.c                               |    3 +-
 run-command.c                        |    3 +
 9 files changed, 1403 insertions(+), 1343 deletions(-)
 create mode 100644 contrib/vcbuild/vcbuild.sln

diff --git a/builtin-fast-export.c b/builtin-fast-export.c
index c48c18d..24a50ae 100644
--- a/builtin-fast-export.c
+++ b/builtin-fast-export.c
@@ -24,6 +24,7 @@ static const char *fast_export_usage[] = {
 
 static int progress;
 static enum { ABORT, VERBATIM, WARN, STRIP } signed_tag_mode = ABORT;
+#undef ERROR
 static enum { ERROR, DROP, REWRITE } tag_of_filtered_mode = ABORT;
 static int fake_missing_tagger;
 
diff --git a/compat/fopen.c b/compat/fopen.c
index b5ca142..b9a02e4 100644
--- a/compat/fopen.c
+++ b/compat/fopen.c
@@ -10,6 +10,7 @@
  */
 #undef FREAD_READS_DIRECTORIES
 #include "../git-compat-util.h"
+#undef stat
 
 FILE *git_fopen(const char *path, const char *mode)
 {
diff --git a/compat/mingw.c b/compat/mingw.c
index 405a51e..f3a74f8 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -151,6 +151,7 @@ static inline time_t filetime_to_time_t(const FILETIME *ft)
  * When a path ends with a slash, the stat will fail with ENOENT. In
  * this case, we strip the trailing slashes and stat again.
  */
+#undef stat
 static int do_lstat(const char *file_name, struct stat *buf)
 {
 	WIN32_FILE_ATTRIBUTE_DATA fdata;
@@ -1200,8 +1201,9 @@ struct dirent *mingw_readdir(DIR *dir)
 
 	if (dir->dd_handle == (long)INVALID_HANDLE_VALUE && dir->dd_stat == 0)
 	{
+		DWORD lasterr;
 		handle = FindFirstFileA(dir->dd_name, &buf);
-		DWORD lasterr = GetLastError();
+		lasterr = GetLastError();
 		dir->dd_handle = (long)handle;
 		if (handle == INVALID_HANDLE_VALUE && (lasterr != ERROR_NO_MORE_FILES)) {
 			errno = err_win_to_posix(lasterr);
diff --git a/compat/mingw.h b/compat/mingw.h
index 0ede971..281bfde 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -171,13 +171,20 @@ int mingw_getpagesize(void);
 /* Use mingw_lstat() instead of lstat()/stat() and
  * mingw_fstat() instead of fstat() on Windows.
  */
+#undef off_t
 #define off_t off64_t
-#define stat _stati64
+#undef stat
+#define stat      _stat64
+#define stat(x,y) _stati64(x,y)
+#undef lseek
 #define lseek _lseeki64
 int mingw_lstat(const char *file_name, struct stat *buf);
 int mingw_fstat(int fd, struct stat *buf);
+#undef fstat
 #define fstat mingw_fstat
+#undef lstat
 #define lstat mingw_lstat
+#undef _stati64
 #define _stati64(x,y) mingw_lstat(x,y)
 
 int mingw_utime(const char *file_name, const struct utimbuf *times);
diff --git a/contrib/vcbuild/include/unistd.h b/contrib/vcbuild/include/unistd.h
index 311cbc0..5b4d780 100644
--- a/contrib/vcbuild/include/unistd.h
+++ b/contrib/vcbuild/include/unistd.h
@@ -4,6 +4,7 @@
 /*Configuration*/
 
 #define __MINGW32__
+#define NO_LIBGEN_H
 #define NO_SYS_SELECT_H
 #define NO_PTHEADS
 #define HAVE_STRING_H 1
@@ -17,7 +18,7 @@
 #define NTDDI_VERSION NTDDI_WIN2KSP1
 #define inline __inline
 #define __inline__ __inline
-#define NO_MMAP
+#define USE_WIN32_MMAP
 #define SHA1_HEADER "mozilla-sha1\\sha1.h"
 #define NO_ST_BLOCKS_IN_STRUCT_STAT
 #define ETC_GITCONFIG "%HOME%"
@@ -30,6 +31,7 @@
 #define va_copy va_start
 #define NO_STRTOUMAX
 #define REGEX_MALLOC
+#define NO_NSEC
 
 /* Win32 define for porting git*/
 
@@ -73,6 +75,8 @@ typedef unsigned long long   uint64_t;
 typedef long long  intmax_t;
 typedef unsigned long long uintmax_t;
 
+typedef int64_t off64_t;
+
 #define STDOUT_FILENO 1
 #define STDERR_FILENO 2
 
@@ -137,6 +141,6 @@ typedef unsigned long long uintmax_t;
 #define close _close
 #define dup _dup
 #define dup2 _dup2
-#define lseek _lseek
+//#define lseek _lseek
 #define write vs_write
 #endif
\ No newline at end of file
diff --git a/contrib/vcbuild/libgit/libgit.vcproj b/contrib/vcbuild/libgit/libgit.vcproj
index b6579e4..8bf9696 100644
--- a/contrib/vcbuild/libgit/libgit.vcproj
+++ b/contrib/vcbuild/libgit/libgit.vcproj
@@ -1,1338 +1,1350 @@
-<?xml version="1.0" encoding="gb2312"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="libgit"
-	ProjectGUID="{F6DEC8C3-B803-4A86-8848-430F08B499E3}"
-	RootNamespace="libgit"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..;..\;..\include;..\..\..\compat;..\..\..\compat\fnmatch;..\..\..\compat\regex;.\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\include;..\..\compat;..\..\compat\fnmatch;..\..\compat\regex;.\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\porting.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\mozilla-sha1\sha1.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\..\archive.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\attr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\blob.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\branch.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\bundle.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\cache-tree.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\cache.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\color.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\commit.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\csum-file.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\decorate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\delta.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diff.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diffcore.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\dir.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\exec_cmd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\fetch-pack.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\fsck.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\git-compat-util.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\graph.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\grep.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\hash.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\help.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\http.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\levenshtein.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\list-objects.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\ll-merge.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\log-tree.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\mailmap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\merge-recursive.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\notes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\object.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pack-refs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pack-revindex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pack.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\parse-options.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\patch-ids.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pkt-line.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\progress.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\quote.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\reachable.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\reflog-walk.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\refs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\remote.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\rerere.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\revision.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\run-command.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\send-pack.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sha1-lookup.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\shortlog.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sideband.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sigchain.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\strbuf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\string-list.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\tag.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\tar.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\thread-utils.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\transport.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\tree-walk.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\tree.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\unpack-trees.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\userdiff.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\utf8.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\walker.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\wt-status.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff-interface.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-		<Filter
-			Name="compat"
-			>
-			<File
-				RelativePath="..\..\..\compat\cygwin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\fnmatch\fnmatch.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\fnmatch\fnmatch.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\fopen.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\memmem.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\mingw.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\mingw.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\mkdtemp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\mmap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\pread.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\qsort.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\regex\regex.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\regex\regex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\setenv.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\snprintf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\strcasestr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\strlcpy.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\strtoumax.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\unsetenv.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\win32.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\winansi.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="git"
-			>
-			<File
-				RelativePath="..\..\..\abspath.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\alias.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\alloc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\archive-tar.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\archive-zip.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\archive.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\attr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\base85.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\blob.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\branch.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-add.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-annotate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-apply.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-archive.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-blame.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-branch.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-bundle.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-cat-file.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-check-attr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-check-ref-format.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-checkout-index.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-checkout.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-clean.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-clone.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-commit-tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-commit.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-config.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-count-objects.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-describe.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-diff-files.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-diff-index.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-diff-tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-diff.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-fast-export.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-fetch--tool.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-fetch-pack.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-fetch.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-fmt-merge-msg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-for-each-ref.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-fsck.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-gc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-grep.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-help.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-init-db.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-log.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-ls-files.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-ls-remote.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-ls-tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-mailinfo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-mailsplit.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-merge-base.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-merge-file.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-merge-ours.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-merge-recursive.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-merge.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-mv.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-name-rev.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-pack-objects.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-pack-refs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-prune-packed.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-prune.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-push.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-read-tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-receive-pack.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-reflog.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-remote.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-replace.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-rerere.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-reset.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-rev-list.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-rev-parse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-revert.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-rm.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-send-pack.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-shortlog.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-show-branch.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-show-ref.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-stripspace.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-symbolic-ref.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-tag.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-tar-tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-unpack-objects.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-update-index.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-update-ref.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-upload-archive.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-verify-pack.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-verify-tag.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-write-tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\bundle.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\cache-tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\color.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\combine-diff.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\commit.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\config.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\connect.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\convert.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\copy.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\csum-file.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\ctype.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\date.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\decorate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diff-delta.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diff-lib.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diff-no-index.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diff.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diffcore-break.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diffcore-delta.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diffcore-order.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diffcore-pickaxe.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diffcore-rename.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\dir.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\editor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\entry.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\environment.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\exec_cmd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\fsck.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\graph.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\grep.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\hash.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\help.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\ident.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\levenshtein.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\list-objects.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\ll-merge.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lockfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\log-tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\mailmap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\match-trees.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\merge-file.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\merge-recursive.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\name-hash.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\notes.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\object.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pack-check.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pack-refs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pack-revindex.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pack-write.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pager.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\parse-options.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\patch-delta.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\patch-ids.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\path.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pkt-line.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\preload-index.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pretty.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\progress.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\quote.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\reachable.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\read-cache.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\reflog-walk.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\refs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\remote.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\replace_object.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\rerere.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\revision.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\run-command.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\server-info.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\setup.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sha1-lookup.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sha1_file.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sha1_name.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\shallow.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sideband.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sigchain.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\strbuf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\string-list.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\symlinks.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\tag.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\thread-utils.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\trace.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\transport.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\tree-diff.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\tree-walk.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\unpack-trees.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\usage.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\userdiff.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\utf8.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\walker.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\wrapper.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\write_or_die.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\ws.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\wt-status.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff-interface.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="xdiff"
-			>
-			<File
-				RelativePath="..\..\..\xdiff\xdiff.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xdiffi.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xdiffi.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xemit.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xemit.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xinclude.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xmacros.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xmerge.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xpatience.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xprepare.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xprepare.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xtypes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xutils.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xutils.h"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\ReadMe.txt"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="gb2312"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="libgit"
+	ProjectGUID="{F6DEC8C3-B803-4A86-8848-430F08B499E3}"
+	RootNamespace="libgit"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..;..\..;..\;..\include;..\..\..\compat;..\..\..\compat\fnmatch;..\..\..\compat\regex;.\"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\include;..\..\compat;..\..\compat\fnmatch;..\..\compat\regex;.\"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\porting.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\mozilla-sha1\sha1.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\archive.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\attr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\blob.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\branch.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\bundle.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\cache-tree.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\cache.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\color.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\commit.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\csum-file.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decorate.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\delta.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diff.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diffcore.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\dir.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\exec_cmd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\fetch-pack.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\fsck.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\git-compat-util.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\graph.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\grep.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\hash.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\help.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\http.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\levenshtein.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\list-objects.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ll-merge.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\log-tree.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\mailmap.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\merge-recursive.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\notes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\object.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pack-refs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pack-revindex.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pack.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\parse-options.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\patch-ids.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pkt-line.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\progress.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\quote.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\reachable.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\reflog-walk.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\refs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\remote.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\rerere.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\revision.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\run-command.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\send-pack.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\sha1-lookup.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\shortlog.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\sideband.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\sigchain.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\strbuf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\string-list.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tag.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tar.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\thread-utils.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\transport.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tree-walk.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tree.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\unpack-trees.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\userdiff.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\utf8.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\walker.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\wt-status.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff-interface.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+		<Filter
+			Name="compat"
+			>
+			<File
+				RelativePath="..\..\..\compat\basename.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\cygwin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\fnmatch\fnmatch.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\fnmatch\fnmatch.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\fopen.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\memmem.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\mingw.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\mingw.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\mkdtemp.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\mkstemps.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\pread.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\qsort.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\regex\regex.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\regex\regex.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\setenv.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\snprintf.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\strcasestr.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\strlcpy.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\strtoumax.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\unsetenv.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\win32.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\win32mmap.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\winansi.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="git"
+			>
+			<File
+				RelativePath="..\..\..\abspath.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\alias.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\alloc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\archive-tar.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\archive-zip.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\archive.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\attr.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\base85.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\bisect.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\blob.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\branch.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-add.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-annotate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-apply.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-archive.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-bisect--helper.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-blame.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-branch.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-bundle.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-cat-file.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-check-attr.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-check-ref-format.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-checkout-index.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-checkout.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-clean.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-clone.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-commit-tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-commit.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-config.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-count-objects.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-describe.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-diff-files.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-diff-index.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-diff-tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-diff.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-fast-export.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-fetch--tool.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-fetch-pack.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-fetch.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-fmt-merge-msg.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-for-each-ref.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-fsck.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-gc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-grep.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-help.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-init-db.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-log.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-ls-files.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-ls-remote.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-ls-tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-mailinfo.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-mailsplit.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-merge-base.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-merge-file.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-merge-ours.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-merge-recursive.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-merge.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-mktree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-mv.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-name-rev.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-pack-objects.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-pack-refs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-prune-packed.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-prune.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-push.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-read-tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-receive-pack.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-reflog.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-remote.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-rerere.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-reset.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-rev-list.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-rev-parse.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-revert.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-rm.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-send-pack.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-shortlog.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-show-branch.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-show-ref.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-stripspace.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-symbolic-ref.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-tag.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-tar-tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-unpack-objects.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-update-index.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-update-ref.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-upload-archive.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-verify-pack.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-verify-tag.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-write-tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\bundle.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\cache-tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\color.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\combine-diff.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\commit.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\config.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\connect.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\convert.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\copy.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\csum-file.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ctype.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\date.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decorate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diff-delta.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diff-lib.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diff-no-index.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diff.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diffcore-break.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diffcore-delta.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diffcore-order.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diffcore-pickaxe.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diffcore-rename.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\dir.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\editor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\entry.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\environment.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\exec_cmd.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\fsck.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\graph.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\grep.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\hash.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\help.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ident.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\levenshtein.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\list-objects.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ll-merge.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\lockfile.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\log-tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\mailmap.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\match-trees.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\merge-file.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\merge-recursive.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\merge-tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\name-hash.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\object.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pack-check.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pack-refs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pack-revindex.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pack-write.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pager.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\parse-options.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\patch-delta.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\patch-ids.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\path.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pkt-line.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\preload-index.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pretty.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\progress.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\quote.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\reachable.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\read-cache.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\reflog-walk.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\refs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\remote.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\rerere.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\revision.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\run-command.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\server-info.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\setup.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\sha1-lookup.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\sha1_file.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\sha1_name.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\shallow.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\sideband.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\sigchain.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\strbuf.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\string-list.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\symlinks.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tag.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\thread-utils.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\trace.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\transport.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tree-diff.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tree-walk.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\unpack-trees.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\usage.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\userdiff.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\utf8.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\walker.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\wrapper.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\write_or_die.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ws.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\wt-status.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff-interface.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="xdiff"
+			>
+			<File
+				RelativePath="..\..\..\xdiff\xdiff.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xdiffi.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xdiffi.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xemit.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xemit.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xinclude.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xmacros.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xmerge.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xpatience.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xprepare.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xprepare.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xtypes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xutils.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xutils.h"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath=".\ReadMe.txt"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/contrib/vcbuild/vcbuild.sln b/contrib/vcbuild/vcbuild.sln
new file mode 100644
index 0000000..fbd1377
--- /dev/null
+++ b/contrib/vcbuild/vcbuild.sln
@@ -0,0 +1,29 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libgit", "libgit\libgit.vcproj", "{F6DEC8C3-B803-4A86-8848-430F08B499E3}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "git", "git\git.vcproj", "{E3E30E51-C5AD-407B-AB43-985E4111474A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{F6DEC8C3-B803-4A86-8848-430F08B499E3} = {F6DEC8C3-B803-4A86-8848-430F08B499E3}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F6DEC8C3-B803-4A86-8848-430F08B499E3}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F6DEC8C3-B803-4A86-8848-430F08B499E3}.Debug|Win32.Build.0 = Debug|Win32
+		{F6DEC8C3-B803-4A86-8848-430F08B499E3}.Release|Win32.ActiveCfg = Release|Win32
+		{F6DEC8C3-B803-4A86-8848-430F08B499E3}.Release|Win32.Build.0 = Release|Win32
+		{E3E30E51-C5AD-407B-AB43-985E4111474A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E3E30E51-C5AD-407B-AB43-985E4111474A}.Debug|Win32.Build.0 = Debug|Win32
+		{E3E30E51-C5AD-407B-AB43-985E4111474A}.Release|Win32.ActiveCfg = Release|Win32
+		{E3E30E51-C5AD-407B-AB43-985E4111474A}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/help.c b/help.c
index 6c46d8b..399b0b4 100644
--- a/help.c
+++ b/help.c
@@ -127,7 +127,7 @@ static int is_executable(const char *name)
 		return 0;
 
 #ifdef __MINGW32__
-	/* cannot trust the executable bit, peek into the file instead */
+{	/* cannot trust the executable bit, peek into the file instead */
 	char buf[3] = { 0 };
 	int n;
 	int fd = open(name, O_RDONLY);
@@ -140,6 +140,7 @@ static int is_executable(const char *name)
 				st.st_mode |= S_IXUSR;
 		close(fd);
 	}
+}
 #endif
 	return st.st_mode & S_IXUSR;
 }
diff --git a/run-command.c b/run-command.c
index ff3d8e2..06cce47 100644
--- a/run-command.c
+++ b/run-command.c
@@ -123,6 +123,7 @@ int start_command(struct child_process *cmd)
 		exit(127);
 	}
 #else
+{
 	int s0 = -1, s1 = -1, s2 = -1;	/* backups of stdin, stdout, stderr */
 	const char **sargv = cmd->argv;
 	char **env = environ;
@@ -186,6 +187,7 @@ int start_command(struct child_process *cmd)
 		dup2(s1, 1), close(s1);
 	if (s2 >= 0)
 		dup2(s2, 2), close(s2);
+}
 #endif
 
 	if (cmd->pid < 0) {
@@ -293,6 +295,7 @@ int run_command_v_opt_cd_env(const char **argv, int opt, const char *dir, const
 }
 
 #ifdef __MINGW32__
+#define __stdcall
 static __stdcall unsigned run_thread(void *data)
 {
 	struct async *async = data;
-- 
1.6.4.msysgit.0


[-- Attachment #4: 0002-enable-release-build.patch --]
[-- Type: application/octet-stream, Size: 55475 bytes --]

From ba67bc0341367ccaab1317902ae8acd7209214b7 Mon Sep 17 00:00:00 2001
From: Frank Li <lznuaa@gmail.com>
Date: Wed, 5 Aug 2009 14:39:01 +0800
Subject: [PATCH 2/5] enable release build

---
 compat/mingw.c                       |    1 -
 compat/mingw.h                       |   13 +-
 contrib/vcbuild/git/git.vcproj       |    6 +-
 contrib/vcbuild/include/unistd.h     |   39 +-
 contrib/vcbuild/libgit/libgit.vcproj | 2700 +++++++++++++++++-----------------
 5 files changed, 1394 insertions(+), 1365 deletions(-)

diff --git a/compat/mingw.c b/compat/mingw.c
index f3a74f8..96c1a5f 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -151,7 +151,6 @@ static inline time_t filetime_to_time_t(const FILETIME *ft)
  * When a path ends with a slash, the stat will fail with ENOENT. In
  * this case, we strip the trailing slashes and stat again.
  */
-#undef stat
 static int do_lstat(const char *file_name, struct stat *buf)
 {
 	WIN32_FILE_ATTRIBUTE_DATA fdata;
diff --git a/compat/mingw.h b/compat/mingw.h
index 281bfde..b4276c4 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -173,19 +173,24 @@ int mingw_getpagesize(void);
  */
 #undef off_t
 #define off_t off64_t
-#undef stat
+
+
+#define stat(x,y) mingw_lstat(x,y)
 #define stat      _stat64
-#define stat(x,y) _stati64(x,y)
+
 #undef lseek
 #define lseek _lseeki64
+
 int mingw_lstat(const char *file_name, struct stat *buf);
 int mingw_fstat(int fd, struct stat *buf);
+
 #undef fstat
 #define fstat mingw_fstat
+
 #undef lstat
 #define lstat mingw_lstat
-#undef _stati64
-#define _stati64(x,y) mingw_lstat(x,y)
+
+
 
 int mingw_utime(const char *file_name, const struct utimbuf *times);
 #define utime mingw_utime
diff --git a/contrib/vcbuild/git/git.vcproj b/contrib/vcbuild/git/git.vcproj
index ff5e1d9..49ab8bf 100644
--- a/contrib/vcbuild/git/git.vcproj
+++ b/contrib/vcbuild/git/git.vcproj
@@ -91,10 +91,10 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)\bin"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="1"
-			CharacterSet="1"
+			CharacterSet="0"
 			WholeProgramOptimization="1"
 			>
 			<Tool
@@ -116,6 +116,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\..;..\..;..\;..\include;..\..\..\compat;..\..\..\compat\fnmatch;..\..\..\compat\regex;.\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -134,6 +135,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="wininet.lib ws2_32.lib ../lib/zlib.lib"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
diff --git a/contrib/vcbuild/include/unistd.h b/contrib/vcbuild/include/unistd.h
index 5b4d780..3450bc3 100644
--- a/contrib/vcbuild/include/unistd.h
+++ b/contrib/vcbuild/include/unistd.h
@@ -4,13 +4,35 @@
 /*Configuration*/
 
 #define __MINGW32__
+#define NO_PREAD
+#define NO_OPENSSL
 #define NO_LIBGEN_H
+#define NO_SYMLINK_HEAD
+#define NO_IPV6
+#define NO_SETENV
+#define NO_UNSETENV
+#define NO_STRCASESTR
+#define NO_STRLCPY
+#define NO_MEMMEM
+#define NO_C99_FORMAT
+#define NO_STRTOUMAX
+#define NO_MKDTEMP
+#define NO_MKSTEMPS
+
+#define RUNTIME_PREFIX
+#define NO_ST_BLOCKS_IN_STRUCT_STAT
+#define NO_NSEC
+#define USE_WIN32_MMAP
+#define USE_NED_ALLOCATOR
+
+#define NO_REGEX
+
 #define NO_SYS_SELECT_H
 #define NO_PTHEADS
 #define HAVE_STRING_H 1
 #define STDC_HEADERS
 #define NO_ICONV
-#define NO_OPENSSL
+
 #define WINVER 0x0500
 #define _WIN32_WINNT 0x0500
 #define _WIN32_WINDOWS 0x0410
@@ -18,20 +40,21 @@
 #define NTDDI_VERSION NTDDI_WIN2KSP1
 #define inline __inline
 #define __inline__ __inline
-#define USE_WIN32_MMAP
+
 #define SHA1_HEADER "mozilla-sha1\\sha1.h"
-#define NO_ST_BLOCKS_IN_STRUCT_STAT
+
 #define ETC_GITCONFIG "%HOME%"
-#define NO_IPV6
-#define RUNTIME_PREFIX
+
 #define NO_PTHREADS
 #define NO_CURL
-#define NO_MEMMEM
-#define NO_STRCASESTR
+
+
 #define va_copy va_start
 #define NO_STRTOUMAX
 #define REGEX_MALLOC
-#define NO_NSEC
+
+
+
 
 /* Win32 define for porting git*/
 
diff --git a/contrib/vcbuild/libgit/libgit.vcproj b/contrib/vcbuild/libgit/libgit.vcproj
index 8bf9696..7e45146 100644
--- a/contrib/vcbuild/libgit/libgit.vcproj
+++ b/contrib/vcbuild/libgit/libgit.vcproj
@@ -1,1350 +1,1350 @@
-<?xml version="1.0" encoding="gb2312"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="libgit"
-	ProjectGUID="{F6DEC8C3-B803-4A86-8848-430F08B499E3}"
-	RootNamespace="libgit"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..;..\;..\include;..\..\..\compat;..\..\..\compat\fnmatch;..\..\..\compat\regex;.\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\include;..\..\compat;..\..\compat\fnmatch;..\..\compat\regex;.\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\porting.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\mozilla-sha1\sha1.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\..\archive.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\attr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\blob.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\branch.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\bundle.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\cache-tree.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\cache.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\color.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\commit.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\csum-file.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\decorate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\delta.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diff.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diffcore.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\dir.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\exec_cmd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\fetch-pack.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\fsck.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\git-compat-util.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\graph.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\grep.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\hash.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\help.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\http.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\levenshtein.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\list-objects.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\ll-merge.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\log-tree.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\mailmap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\merge-recursive.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\notes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\object.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pack-refs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pack-revindex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pack.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\parse-options.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\patch-ids.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pkt-line.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\progress.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\quote.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\reachable.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\reflog-walk.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\refs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\remote.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\rerere.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\revision.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\run-command.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\send-pack.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sha1-lookup.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\shortlog.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sideband.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sigchain.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\strbuf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\string-list.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\tag.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\tar.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\thread-utils.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\transport.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\tree-walk.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\tree.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\unpack-trees.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\userdiff.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\utf8.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\walker.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\wt-status.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff-interface.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-		<Filter
-			Name="compat"
-			>
-			<File
-				RelativePath="..\..\..\compat\basename.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\cygwin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\fnmatch\fnmatch.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\fnmatch\fnmatch.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\fopen.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\memmem.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\mingw.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\mingw.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\mkdtemp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\mkstemps.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\pread.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\qsort.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\regex\regex.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\regex\regex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\setenv.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\snprintf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\strcasestr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\strlcpy.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\strtoumax.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\unsetenv.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\win32.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\win32mmap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\winansi.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="git"
-			>
-			<File
-				RelativePath="..\..\..\abspath.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\alias.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\alloc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\archive-tar.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\archive-zip.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\archive.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\attr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\base85.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\bisect.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\blob.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\branch.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-add.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-annotate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-apply.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-archive.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-bisect--helper.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-blame.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-branch.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-bundle.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-cat-file.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-check-attr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-check-ref-format.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-checkout-index.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-checkout.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-clean.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-clone.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-commit-tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-commit.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-config.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-count-objects.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-describe.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-diff-files.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-diff-index.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-diff-tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-diff.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-fast-export.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-fetch--tool.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-fetch-pack.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-fetch.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-fmt-merge-msg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-for-each-ref.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-fsck.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-gc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-grep.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-help.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-init-db.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-log.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-ls-files.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-ls-remote.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-ls-tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-mailinfo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-mailsplit.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-merge-base.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-merge-file.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-merge-ours.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-merge-recursive.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-merge.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-mktree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-mv.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-name-rev.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-pack-objects.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-pack-refs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-prune-packed.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-prune.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-push.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-read-tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-receive-pack.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-reflog.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-remote.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-rerere.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-reset.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-rev-list.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-rev-parse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-revert.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-rm.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-send-pack.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-shortlog.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-show-branch.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-show-ref.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-stripspace.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-symbolic-ref.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-tag.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-tar-tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-unpack-objects.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-update-index.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-update-ref.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-upload-archive.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-verify-pack.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-verify-tag.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-write-tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\bundle.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\cache-tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\color.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\combine-diff.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\commit.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\config.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\connect.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\convert.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\copy.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\csum-file.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\ctype.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\date.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\decorate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diff-delta.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diff-lib.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diff-no-index.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diff.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diffcore-break.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diffcore-delta.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diffcore-order.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diffcore-pickaxe.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diffcore-rename.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\dir.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\editor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\entry.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\environment.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\exec_cmd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\fsck.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\graph.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\grep.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\hash.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\help.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\ident.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\levenshtein.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\list-objects.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\ll-merge.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lockfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\log-tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\mailmap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\match-trees.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\merge-file.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\merge-recursive.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\merge-tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\name-hash.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\object.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pack-check.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pack-refs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pack-revindex.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pack-write.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pager.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\parse-options.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\patch-delta.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\patch-ids.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\path.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pkt-line.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\preload-index.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pretty.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\progress.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\quote.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\reachable.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\read-cache.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\reflog-walk.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\refs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\remote.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\rerere.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\revision.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\run-command.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\server-info.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\setup.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sha1-lookup.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sha1_file.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sha1_name.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\shallow.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sideband.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sigchain.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\strbuf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\string-list.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\symlinks.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\tag.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\thread-utils.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\trace.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\transport.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\tree-diff.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\tree-walk.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\unpack-trees.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\usage.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\userdiff.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\utf8.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\walker.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\wrapper.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\write_or_die.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\ws.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\wt-status.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff-interface.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="xdiff"
-			>
-			<File
-				RelativePath="..\..\..\xdiff\xdiff.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xdiffi.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xdiffi.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xemit.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xemit.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xinclude.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xmacros.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xmerge.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xpatience.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xprepare.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xprepare.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xtypes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xutils.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xutils.h"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\ReadMe.txt"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="gb2312"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="libgit"
+	ProjectGUID="{F6DEC8C3-B803-4A86-8848-430F08B499E3}"
+	RootNamespace="libgit"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..;..\..;..\;..\include;..\..\..\compat;..\..\..\compat\fnmatch;..\..\..\compat\regex;.\"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="0"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\..;..\..;..\;..\include;..\..\..\compat;..\..\..\compat\fnmatch;..\..\..\compat\regex;.\"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\porting.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\mozilla-sha1\sha1.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\archive.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\attr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\blob.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\branch.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\bundle.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\cache-tree.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\cache.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\color.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\commit.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\csum-file.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decorate.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\delta.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diff.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diffcore.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\dir.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\exec_cmd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\fetch-pack.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\fsck.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\git-compat-util.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\graph.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\grep.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\hash.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\help.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\http.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\levenshtein.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\list-objects.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ll-merge.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\log-tree.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\mailmap.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\merge-recursive.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\notes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\object.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pack-refs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pack-revindex.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pack.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\parse-options.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\patch-ids.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pkt-line.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\progress.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\quote.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\reachable.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\reflog-walk.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\refs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\remote.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\rerere.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\revision.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\run-command.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\send-pack.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\sha1-lookup.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\shortlog.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\sideband.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\sigchain.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\strbuf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\string-list.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tag.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tar.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\thread-utils.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\transport.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tree-walk.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tree.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\unpack-trees.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\userdiff.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\utf8.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\walker.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\wt-status.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff-interface.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+		<Filter
+			Name="compat"
+			>
+			<File
+				RelativePath="..\..\..\compat\basename.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\cygwin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\fnmatch\fnmatch.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\fnmatch\fnmatch.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\fopen.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\memmem.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\mingw.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\mingw.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\mkdtemp.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\mkstemps.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\pread.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\qsort.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\regex\regex.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\regex\regex.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\setenv.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\snprintf.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\strcasestr.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\strlcpy.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\strtoumax.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\unsetenv.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\win32.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\win32mmap.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\winansi.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="git"
+			>
+			<File
+				RelativePath="..\..\..\abspath.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\alias.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\alloc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\archive-tar.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\archive-zip.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\archive.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\attr.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\base85.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\bisect.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\blob.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\branch.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-add.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-annotate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-apply.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-archive.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-bisect--helper.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-blame.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-branch.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-bundle.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-cat-file.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-check-attr.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-check-ref-format.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-checkout-index.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-checkout.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-clean.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-clone.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-commit-tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-commit.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-config.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-count-objects.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-describe.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-diff-files.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-diff-index.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-diff-tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-diff.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-fast-export.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-fetch--tool.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-fetch-pack.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-fetch.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-fmt-merge-msg.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-for-each-ref.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-fsck.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-gc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-grep.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-help.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-init-db.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-log.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-ls-files.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-ls-remote.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-ls-tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-mailinfo.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-mailsplit.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-merge-base.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-merge-file.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-merge-ours.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-merge-recursive.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-merge.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-mktree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-mv.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-name-rev.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-pack-objects.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-pack-refs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-prune-packed.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-prune.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-push.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-read-tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-receive-pack.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-reflog.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-remote.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-rerere.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-reset.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-rev-list.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-rev-parse.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-revert.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-rm.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-send-pack.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-shortlog.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-show-branch.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-show-ref.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-stripspace.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-symbolic-ref.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-tag.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-tar-tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-unpack-objects.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-update-index.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-update-ref.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-upload-archive.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-verify-pack.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-verify-tag.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-write-tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\bundle.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\cache-tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\color.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\combine-diff.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\commit.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\config.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\connect.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\convert.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\copy.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\csum-file.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ctype.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\date.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decorate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diff-delta.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diff-lib.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diff-no-index.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diff.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diffcore-break.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diffcore-delta.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diffcore-order.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diffcore-pickaxe.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diffcore-rename.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\dir.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\editor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\entry.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\environment.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\exec_cmd.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\fsck.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\graph.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\grep.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\hash.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\help.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ident.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\levenshtein.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\list-objects.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ll-merge.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\lockfile.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\log-tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\mailmap.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\match-trees.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\merge-file.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\merge-recursive.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\merge-tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\name-hash.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\object.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pack-check.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pack-refs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pack-revindex.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pack-write.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pager.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\parse-options.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\patch-delta.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\patch-ids.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\path.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pkt-line.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\preload-index.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pretty.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\progress.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\quote.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\reachable.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\read-cache.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\reflog-walk.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\refs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\remote.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\rerere.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\revision.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\run-command.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\server-info.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\setup.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\sha1-lookup.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\sha1_file.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\sha1_name.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\shallow.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\sideband.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\sigchain.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\strbuf.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\string-list.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\symlinks.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tag.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\thread-utils.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\trace.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\transport.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tree-diff.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tree-walk.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\unpack-trees.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\usage.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\userdiff.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\utf8.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\walker.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\wrapper.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\write_or_die.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ws.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\wt-status.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff-interface.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="xdiff"
+			>
+			<File
+				RelativePath="..\..\..\xdiff\xdiff.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xdiffi.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xdiffi.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xemit.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xemit.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xinclude.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xmacros.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xmerge.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xpatience.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xprepare.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xprepare.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xtypes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xutils.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xutils.h"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath=".\ReadMe.txt"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
-- 
1.6.4.msysgit.0


[-- Attachment #5: 0003-Release-log-command-okay.patch --]
[-- Type: application/octet-stream, Size: 848 bytes --]

From bbec8b9376d7183abda907de0e4f995f79fe9914 Mon Sep 17 00:00:00 2001
From: Frank Li <lznuaa@gmail.com>
Date: Wed, 5 Aug 2009 21:31:36 +0800
Subject: [PATCH 3/5] Release log command okay

---
 contrib/vcbuild/libgit/libgit.vcproj |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/contrib/vcbuild/libgit/libgit.vcproj b/contrib/vcbuild/libgit/libgit.vcproj
index 7e45146..4f2d234 100644
--- a/contrib/vcbuild/libgit/libgit.vcproj
+++ b/contrib/vcbuild/libgit/libgit.vcproj
@@ -105,6 +105,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
+				InlineFunctionExpansion="1"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\..\..;..\..;..\;..\include;..\..\..\compat;..\..\..\compat\fnmatch;..\..\..\compat\regex;.\"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-- 
1.6.4.msysgit.0


[-- Attachment #6: 0004-Move-open-dir-function-to-mingw.c.patch --]
[-- Type: application/octet-stream, Size: 55367 bytes --]

From b152ebd366280699a166c51466a031329e3d1300 Mon Sep 17 00:00:00 2001
From: Frank Li <lznuaa@gmail.com>
Date: Sat, 8 Aug 2009 11:45:17 +0800
Subject: [PATCH 4/5] Move open dir function to mingw.c

Signed-off-by: Frank Li <lznuaa@gmail.com>
---
 compat/mingw.c                       |   32 +
 contrib/vcbuild/include/unistd.h     |    9 +-
 contrib/vcbuild/libgit/libgit.vcproj | 2702 +++++++++++++++++-----------------
 contrib/vcbuild/porting.c            |   66 +-
 4 files changed, 1393 insertions(+), 1416 deletions(-)

diff --git a/compat/mingw.c b/compat/mingw.c
index 96c1a5f..1cc2cb7 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1234,4 +1234,36 @@ struct dirent *mingw_readdir(DIR *dir)
 
 	return (struct dirent*)&dir->dd_dir;
 }
+
+DIR *opendir(const char *name)
+{
+	int len;
+	DIR *p;
+	p=(DIR*)malloc(sizeof(DIR));
+	memset(p,0,sizeof(DIR));
+	strncpy(p->dd_name,name,PATH_MAX);
+	len=strlen(p->dd_name);
+	p->dd_name[len]='/';
+	p->dd_name[len+1]='*';
+
+	if(p==NULL)
+		return NULL;
+
+	p->dd_handle=_findfirst(p->dd_name,&p->dd_dta);
+
+	if(p->dd_handle == -1) 
+	{
+		free(p);
+		return NULL;
+	}
+	return p;
+}
+int closedir(DIR *dir)
+{
+	_findclose(dir->dd_handle);
+	free(dir);
+	return 0;
+}
+
 #endif // !NO_MINGW_REPLACE_READDIR
+
diff --git a/contrib/vcbuild/include/unistd.h b/contrib/vcbuild/include/unistd.h
index 3450bc3..93ecd74 100644
--- a/contrib/vcbuild/include/unistd.h
+++ b/contrib/vcbuild/include/unistd.h
@@ -151,9 +151,10 @@ typedef int64_t off64_t;
 #define GIT_VERSION "1.6"
 #define BINDIR "bin"
 #define PREFIX "."
-#define GIT_MAN_PATH "../man"
-#define GIT_INFO_PATH "../info"
-#define GIT_HTML_PATH "../html"
+#define GIT_MAN_PATH "man"
+#define GIT_INFO_PATH "info"
+#define GIT_HTML_PATH "html"
+#define DEFAULT_GIT_TEMPLATE_DIR "templates"
 
 #define NO_STRLCPY
 #define NO_UNSETENV
@@ -165,5 +166,5 @@ typedef int64_t off64_t;
 #define dup _dup
 #define dup2 _dup2
 //#define lseek _lseek
-#define write vs_write
+//#define write vs_write
 #endif
\ No newline at end of file
diff --git a/contrib/vcbuild/libgit/libgit.vcproj b/contrib/vcbuild/libgit/libgit.vcproj
index 4f2d234..5bac103 100644
--- a/contrib/vcbuild/libgit/libgit.vcproj
+++ b/contrib/vcbuild/libgit/libgit.vcproj
@@ -1,1351 +1,1351 @@
-<?xml version="1.0" encoding="gb2312"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="libgit"
-	ProjectGUID="{F6DEC8C3-B803-4A86-8848-430F08B499E3}"
-	RootNamespace="libgit"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..;..\..;..\;..\include;..\..\..\compat;..\..\..\compat\fnmatch;..\..\..\compat\regex;.\"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..;..\..;..\;..\include;..\..\..\compat;..\..\..\compat\fnmatch;..\..\..\compat\regex;.\"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\porting.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\mozilla-sha1\sha1.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\..\archive.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\attr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\blob.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\branch.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\bundle.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\cache-tree.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\cache.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\color.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\commit.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\csum-file.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\decorate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\delta.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diff.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diffcore.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\dir.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\exec_cmd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\fetch-pack.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\fsck.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\git-compat-util.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\graph.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\grep.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\hash.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\help.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\http.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\levenshtein.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\list-objects.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\ll-merge.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\log-tree.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\mailmap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\merge-recursive.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\notes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\object.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pack-refs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pack-revindex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pack.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\parse-options.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\patch-ids.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pkt-line.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\progress.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\quote.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\reachable.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\reflog-walk.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\refs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\remote.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\rerere.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\revision.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\run-command.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\send-pack.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sha1-lookup.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\shortlog.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sideband.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sigchain.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\strbuf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\string-list.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\tag.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\tar.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\thread-utils.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\transport.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\tree-walk.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\tree.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\unpack-trees.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\userdiff.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\utf8.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\walker.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\wt-status.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff-interface.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-		<Filter
-			Name="compat"
-			>
-			<File
-				RelativePath="..\..\..\compat\basename.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\cygwin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\fnmatch\fnmatch.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\fnmatch\fnmatch.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\fopen.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\memmem.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\mingw.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\mingw.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\mkdtemp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\mkstemps.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\pread.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\qsort.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\regex\regex.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\regex\regex.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\setenv.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\snprintf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\strcasestr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\strlcpy.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\strtoumax.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\unsetenv.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\win32.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\win32mmap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\compat\winansi.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="git"
-			>
-			<File
-				RelativePath="..\..\..\abspath.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\alias.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\alloc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\archive-tar.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\archive-zip.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\archive.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\attr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\base85.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\bisect.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\blob.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\branch.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-add.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-annotate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-apply.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-archive.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-bisect--helper.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-blame.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-branch.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-bundle.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-cat-file.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-check-attr.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-check-ref-format.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-checkout-index.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-checkout.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-clean.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-clone.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-commit-tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-commit.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-config.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-count-objects.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-describe.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-diff-files.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-diff-index.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-diff-tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-diff.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-fast-export.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-fetch--tool.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-fetch-pack.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-fetch.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-fmt-merge-msg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-for-each-ref.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-fsck.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-gc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-grep.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-help.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-init-db.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-log.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-ls-files.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-ls-remote.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-ls-tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-mailinfo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-mailsplit.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-merge-base.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-merge-file.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-merge-ours.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-merge-recursive.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-merge.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-mktree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-mv.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-name-rev.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-pack-objects.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-pack-refs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-prune-packed.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-prune.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-push.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-read-tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-receive-pack.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-reflog.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-remote.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-rerere.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-reset.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-rev-list.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-rev-parse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-revert.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-rm.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-send-pack.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-shortlog.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-show-branch.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-show-ref.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-stripspace.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-symbolic-ref.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-tag.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-tar-tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-unpack-objects.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-update-index.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-update-ref.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-upload-archive.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-verify-pack.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-verify-tag.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\builtin-write-tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\bundle.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\cache-tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\color.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\combine-diff.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\commit.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\config.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\connect.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\convert.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\copy.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\csum-file.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\ctype.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\date.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\decorate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diff-delta.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diff-lib.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diff-no-index.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diff.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diffcore-break.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diffcore-delta.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diffcore-order.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diffcore-pickaxe.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\diffcore-rename.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\dir.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\editor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\entry.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\environment.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\exec_cmd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\fsck.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\graph.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\grep.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\hash.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\help.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\ident.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\levenshtein.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\list-objects.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\ll-merge.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\lockfile.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\log-tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\mailmap.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\match-trees.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\merge-file.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\merge-recursive.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\merge-tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\name-hash.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\object.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pack-check.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pack-refs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pack-revindex.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pack-write.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pager.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\parse-options.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\patch-delta.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\patch-ids.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\path.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pkt-line.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\preload-index.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\pretty.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\progress.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\quote.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\reachable.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\read-cache.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\reflog-walk.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\refs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\remote.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\rerere.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\revision.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\run-command.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\server-info.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\setup.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sha1-lookup.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sha1_file.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sha1_name.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\shallow.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sideband.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\sigchain.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\strbuf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\string-list.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\symlinks.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\tag.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\thread-utils.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\trace.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\transport.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\tree-diff.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\tree-walk.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\tree.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\unpack-trees.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\usage.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\userdiff.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\utf8.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\walker.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\wrapper.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\write_or_die.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\ws.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\wt-status.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff-interface.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="xdiff"
-			>
-			<File
-				RelativePath="..\..\..\xdiff\xdiff.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xdiffi.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xdiffi.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xemit.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xemit.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xinclude.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xmacros.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xmerge.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xpatience.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xprepare.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xprepare.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xtypes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xutils.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\xdiff\xutils.h"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\ReadMe.txt"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="gb2312"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="libgit"
+	ProjectGUID="{F6DEC8C3-B803-4A86-8848-430F08B499E3}"
+	RootNamespace="libgit"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..;..\..;..\;..\include;..\..\..\compat;..\..\..\compat\fnmatch;..\..\..\compat\regex;.\"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="0"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\..;..\..;..\;..\include;..\..\..\compat;..\..\..\compat\fnmatch;..\..\..\compat\regex;.\"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\porting.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\mozilla-sha1\sha1.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\archive.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\attr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\blob.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\branch.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\bundle.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\cache-tree.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\cache.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\color.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\commit.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\csum-file.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decorate.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\delta.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diff.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diffcore.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\dir.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\exec_cmd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\fetch-pack.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\fsck.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\git-compat-util.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\graph.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\grep.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\hash.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\help.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\http.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\levenshtein.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\list-objects.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ll-merge.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\log-tree.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\mailmap.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\merge-recursive.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\notes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\object.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pack-refs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pack-revindex.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pack.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\parse-options.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\patch-ids.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pkt-line.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\progress.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\quote.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\reachable.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\reflog-walk.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\refs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\remote.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\rerere.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\revision.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\run-command.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\send-pack.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\sha1-lookup.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\shortlog.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\sideband.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\sigchain.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\strbuf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\string-list.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tag.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tar.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\thread-utils.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\transport.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tree-walk.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tree.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\unpack-trees.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\userdiff.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\utf8.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\walker.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\wt-status.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff-interface.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+		<Filter
+			Name="compat"
+			>
+			<File
+				RelativePath="..\..\..\compat\basename.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\cygwin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\fnmatch\fnmatch.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\fnmatch\fnmatch.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\fopen.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\memmem.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\mingw.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\mingw.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\mkdtemp.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\mkstemps.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\pread.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\qsort.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\regex\regex.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\regex\regex.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\setenv.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\snprintf.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\strcasestr.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\strlcpy.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\strtoumax.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\unsetenv.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\win32.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\win32mmap.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\compat\winansi.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="git"
+			>
+			<File
+				RelativePath="..\..\..\abspath.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\alias.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\alloc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\archive-tar.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\archive-zip.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\archive.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\attr.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\base85.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\bisect.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\blob.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\branch.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-add.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-annotate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-apply.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-archive.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-bisect--helper.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-blame.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-branch.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-bundle.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-cat-file.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-check-attr.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-check-ref-format.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-checkout-index.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-checkout.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-clean.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-clone.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-commit-tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-commit.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-config.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-count-objects.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-describe.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-diff-files.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-diff-index.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-diff-tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-diff.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-fast-export.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-fetch--tool.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-fetch-pack.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-fetch.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-fmt-merge-msg.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-for-each-ref.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-fsck.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-gc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-grep.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-help.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-init-db.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-log.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-ls-files.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-ls-remote.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-ls-tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-mailinfo.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-mailsplit.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-merge-base.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-merge-file.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-merge-ours.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-merge-recursive.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-merge.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-mktree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-mv.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-name-rev.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-pack-objects.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-pack-refs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-prune-packed.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-prune.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-push.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-read-tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-receive-pack.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-reflog.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-remote.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-rerere.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-reset.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-rev-list.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-rev-parse.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-revert.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-rm.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-send-pack.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-shortlog.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-show-branch.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-show-ref.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-stripspace.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-symbolic-ref.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-tag.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-tar-tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-unpack-objects.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-update-index.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-update-ref.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-upload-archive.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-verify-pack.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-verify-tag.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\builtin-write-tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\bundle.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\cache-tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\color.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\combine-diff.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\commit.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\config.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\connect.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\convert.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\copy.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\csum-file.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ctype.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\date.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decorate.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diff-delta.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diff-lib.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diff-no-index.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diff.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diffcore-break.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diffcore-delta.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diffcore-order.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diffcore-pickaxe.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\diffcore-rename.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\dir.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\editor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\entry.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\environment.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\exec_cmd.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\fsck.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\graph.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\grep.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\hash.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\help.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ident.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\levenshtein.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\list-objects.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ll-merge.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\lockfile.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\log-tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\mailmap.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\match-trees.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\merge-file.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\merge-recursive.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\merge-tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\name-hash.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\object.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pack-check.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pack-refs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pack-revindex.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pack-write.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pager.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\parse-options.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\patch-delta.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\patch-ids.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\path.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pkt-line.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\preload-index.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\pretty.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\progress.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\quote.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\reachable.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\read-cache.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\reflog-walk.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\refs.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\remote.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\rerere.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\revision.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\run-command.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\server-info.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\setup.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\sha1-lookup.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\sha1_file.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\sha1_name.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\shallow.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\sideband.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\sigchain.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\strbuf.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\string-list.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\symlinks.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tag.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\thread-utils.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\trace.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\transport.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tree-diff.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tree-walk.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\tree.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\unpack-trees.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\usage.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\userdiff.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\utf8.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\walker.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\wrapper.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\write_or_die.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\ws.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\wt-status.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff-interface.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="xdiff"
+			>
+			<File
+				RelativePath="..\..\..\xdiff\xdiff.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xdiffi.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xdiffi.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xemit.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xemit.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xinclude.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xmacros.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xmerge.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xpatience.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xprepare.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xprepare.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xtypes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xutils.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\xdiff\xutils.h"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath=".\ReadMe.txt"
+			>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/contrib/vcbuild/porting.c b/contrib/vcbuild/porting.c
index 5381862..0625bb4 100644
--- a/contrib/vcbuild/porting.c
+++ b/contrib/vcbuild/porting.c
@@ -7,10 +7,12 @@
 
 int snprintf(char *buff,int size, char *fmt, ...)
 {
+	int n;
 	va_list pArgList;
 	va_start(pArgList,fmt);
-	_snprintf(buff,size-1,fmt,pArgList);
+	n=_snprintf(buff,size-1,fmt,pArgList);
 	va_end(pArgList);
+	return n;
 }
 
 int strcasecmp (const char *s1, const char *s2)
@@ -18,16 +20,12 @@ int strcasecmp (const char *s1, const char *s2)
 	int size1=strlen(s1);
 	int sisz2=strlen(s2);
 
-	_strnicmp(s1,s2,sisz2>size1?sisz2:size1);
+	return _strnicmp(s1,s2,sisz2>size1?sisz2:size1);
 }
 
 int strncasecmp (const char *s1, const char *s2,size_t n)
 {
-	_strnicmp(s1,s2,n);
-}
-size_t getpagesize(void)
-{
-	return 0x1000;
+	return _strnicmp(s1,s2,n);
 }
 
 unsigned long long int
@@ -35,57 +33,3 @@ strtoull(const char *nptr, char **endptr, int base)
 {
 	return _strtoui64(nptr,endptr,base);
 }
-
-DIR *opendir(const char *name)
-{
-	int len;
-	DIR *p;
-	p=(DIR*)malloc(sizeof(DIR));
-	memset(p,0,sizeof(DIR));
-	strncpy(p->dd_name,name,PATH_MAX);
-	len=strlen(p->dd_name);
-	p->dd_name[len]='/';
-	p->dd_name[len+1]='*';
-
-	if(p==NULL)
-		return NULL;
-
-	p->dd_handle=_findfirst(p->dd_name,&p->dd_dta);
-
-	if(p->dd_handle == -1) 
-	{
-		free(p);
-		return NULL;
-	}
-	return p;
-}
-int closedir(DIR *dir)
-{
-	_findclose(dir->dd_handle);
-	free(dir);
-	return 0;
-}
-struct dirent *readdir(DIR *dir)
-{
-	if(_findnext(dir->dd_handle,&dir->dd_dta))
-		return NULL;
-
-	strcpy(dir->dd_dir.d_name,dir->dd_dta.name);
-	dir->dd_dir.d_namlen = dir->dd_dta.size;
-	
-	return &dir->dd_dir;
-}
-char *mkdtemp(char *template)
-{
-	return NULL;
-}
-ssize_t pread(int fd, void *buf, size_t nbytes, off_t offset)
-{
-	_lseek(fd,offset,SEEK_SET);
-	return read(fd,buf,nbytes);
-}
-
-int vs_write(int fd, void * buf, size_t nbytes)
-{
-	return _write(fd,buf,nbytes);
-}
\ No newline at end of file
-- 
1.6.4.msysgit.0


^ permalink raw reply related

* Re: .gitignore vs untracked working file
From: Rostislav Svoboda @ 2009-08-10 13:49 UTC (permalink / raw)
  To: Johannes Sixt, git
In-Reply-To: <4A801D48.3020902@viscovery.net>

> This is not only about ignored files, but untracked files. And the check
> is already there: git said:
>
> Untracked working tree file 'Project/bin/path/file.jjt' would be
> overwritten by merge.

Well the meaning of the error message is clear to you but it wasn't
for me. I simply would not ask if I knew how to correctly interpret
it. I hope I'll have a time to make a little improvement here...

Bost

PS: ...and you can reject it if you don't agree :-)

^ permalink raw reply

* Re: backups with git
From: Sitaram Chamarty @ 2009-08-10 13:38 UTC (permalink / raw)
  To: Roald de Vries; +Cc: git
In-Reply-To: <41CB836B-6057-448E-805F-F25EAF765D27@roalddevries.nl>

On Mon, Aug 10, 2009 at 1:57 PM, Roald de Vries<rdv@roalddevries.nl> wrote:

> I'm thinking of using git as a backup solution for my whole system, setting
> my $GIT_DIR to something like "/backupdisc/backup". Does that seem sensible?

The two questions you have to ask yourself are: will I ever branch and
merge in this "repo", and do I really want versions from weeks and
months ago?

A "no" to the first question means you're essentially using a very
powerful VCS as a mere backup system.  I suggest rdiff-backup or (if
it's mature enough now, not sure) duplicity..

A "no" to the second question means you're needlessly keeping lots of
old data, and have to jump through hoops to get rid of it if you need
to.

There's a limit to how much you can Macgyver git into doing what it is
not intended for :-)

Having said all that, I do use git to manage parts of my $HOME that do
satisfy those constraints (config files, ~/bin, etc) -- I do sometimes
branch and merge, and I do want really old versions.  I do this by
putting all of them in a repo, and symlinking them to $HOME.

Regards,

Sitaram

^ permalink raw reply

* [PATCH] Check return value of ftruncate call in http.c.  Remove possible mem leak
From: Jeff Lasslett @ 2009-08-10 13:42 UTC (permalink / raw)
  To: git, gitster; +Cc: Jeff Lasslett

In new_http_object_request(), check ftruncate() call return value and
handle possible errors.  Remove possible leak of mem pointed to by url.

Signed-off-by: Jeff Lasslett <jeff.lasslett@gmail.com>
---
 http.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/http.c b/http.c
index a2720d5..e8317e1 100644
--- a/http.c
+++ b/http.c
@@ -1098,7 +1098,7 @@ struct http_object_request *new_http_object_request(const char *base_url,
 	char *hex = sha1_to_hex(sha1);
 	char *filename;
 	char prevfile[PATH_MAX];
-	char *url;
+	char *url = NULL;
 	int prevlocal;
 	unsigned char prev_buf[PREV_BUF_SIZE];
 	ssize_t prev_read = 0;
@@ -1189,7 +1189,11 @@ struct http_object_request *new_http_object_request(const char *base_url,
 		if (prev_posn>0) {
 			prev_posn = 0;
 			lseek(freq->localfile, 0, SEEK_SET);
-			ftruncate(freq->localfile, 0);
+			if (ftruncate(freq->localfile, 0) < 0) {
+				error("Couldn't truncate temporary file %s for %s: %s",
+					  freq->tmpfile, freq->filename, strerror(errno));
+				goto abort;
+			}
 		}
 	}
 
@@ -1198,7 +1202,7 @@ struct http_object_request *new_http_object_request(const char *base_url,
 	curl_easy_setopt(freq->slot->curl, CURLOPT_FILE, freq);
 	curl_easy_setopt(freq->slot->curl, CURLOPT_WRITEFUNCTION, fwrite_sha1_file);
 	curl_easy_setopt(freq->slot->curl, CURLOPT_ERRORBUFFER, freq->errorstr);
-	curl_easy_setopt(freq->slot->curl, CURLOPT_URL, url);
+	curl_easy_setopt(freq->slot->curl, CURLOPT_URL, freq->url);
 	curl_easy_setopt(freq->slot->curl, CURLOPT_HTTPHEADER, no_pragma_header);
 
 	/*
@@ -1216,10 +1220,12 @@ struct http_object_request *new_http_object_request(const char *base_url,
 				 CURLOPT_HTTPHEADER, range_header);
 	}
 
+	free(url);
 	return freq;
 
-	free(url);
 abort:
+	free(url);
+	free(freq->url);
 	free(filename);
 	free(freq);
 	return NULL;
-- 
1.6.4.59.g4d590.dirty

^ permalink raw reply related

* Re: backups with git
From: Martin Langhoff @ 2009-08-10 13:20 UTC (permalink / raw)
  To: Roald de Vries; +Cc: git
In-Reply-To: <41CB836B-6057-448E-805F-F25EAF765D27@roalddevries.nl>

On Mon, Aug 10, 2009 at 4:27 AM, Roald de Vries<rdv@roalddevries.nl> wrote:
> I'm thinking of using git as a backup solution for my whole system, setting

There are lots of little problems. The two main ones are, IMHO

 - permissions & ownership
 - large files

Some ppl use it for their homedir, and it can be a moderate success as
long as they don't deal with large files.

cheers,


m
-- 
 martin.langhoff@gmail.com
 martin@laptop.org -- School Server Architect
 - ask interesting questions
 - don't get distracted with shiny stuff  - working code first
 - http://wiki.laptop.org/go/User:Martinlanghoff

^ permalink raw reply

* Re: .gitignore vs untracked working file
From: Johannes Sixt @ 2009-08-10 13:14 UTC (permalink / raw)
  To: Rostislav Svoboda; +Cc: git, Uwe Kleine-König
In-Reply-To: <286817520908100559u6cdcaab0u3a7fdb92cd43eed9@mail.gmail.com>

Rostislav Svoboda schrieb:
> $ git ls-tree master Project/bin/path/file.jjt
> 100644 blob 8d5e24f12c37fd1a435de2d4402591f5b0c2a3cc
> Project/bin/path/file.jjt
> 
> There's a file.jjt in the repo already! But guys! I bet I'm not the
> first one having this problem. Do you think it would be wise to have a
> kind of a check returning
>     'The file '...' ignored in the branch X is not ignored in the
> branch Y (or something)'

This is not only about ignored files, but untracked files. And the check
is already there: git said:

Untracked working tree file 'Project/bin/path/file.jjt' would be
overwritten by merge.

-- Hannes

^ permalink raw reply

* Re: .gitignore vs untracked working file
From: Rostislav Svoboda @ 2009-08-10 12:59 UTC (permalink / raw)
  To: Johannes Sixt, git, Uwe Kleine-König
In-Reply-To: <4A800785.8050909@viscovery.net>

2009/8/10 Johannes Sixt <j.sixt@viscovery.net>:
> Rostislav Svoboda schrieb:
>> 2009/8/10 Uwe Kleine-König <u.kleine-koenig@pengutronix.de>:
>>> Hello,
>>>
>>>> $ git checkout master
>>>> error: Untracked working tree file 'Project/bin/path/file.jjt' would
>>>> be overwritten by merge.
>>> What is the output of
>>>
>>>        $ git ls-files master bin/
>>
>> Nothing:
>
> It should have been
>
>        $ git ls-tree master bin

Merde!

$ git ls-tree master Project/bin/path/file.jjt
100644 blob 8d5e24f12c37fd1a435de2d4402591f5b0c2a3cc
Project/bin/path/file.jjt

There's a file.jjt in the repo already! But guys! I bet I'm not the
first one having this problem. Do you think it would be wise to have a
kind of a check returning
    'The file '...' ignored in the branch X is not ignored in the
branch Y (or something)'

instead of responding questions like mine over and over again?

Bost

PS: ... and yea, thx a lot!

^ permalink raw reply

* Re: [PATCH] fix potential infinite loop given large unsigned integer
From: Johannes Schindelin @ 2009-08-10 12:24 UTC (permalink / raw)
  To: Erik Faye-Lund; +Cc: Christian Couder, Junio C Hamano, Ryan Flynn, git
In-Reply-To: <40aa078e0908100412l3c2afd1bnda9b10aaf1de383f@mail.gmail.com>

Hi,

On Mon, 10 Aug 2009, Erik Faye-Lund wrote:

> On Mon, Aug 10, 2009 at 7:24 AM, Christian
> Couder<chriscool@tuxfamily.org> wrote:
> >> log10() appears to be C99, but can be emulated on earlier C-versions by
> >> doing #define log10(x) (log(x) / log(10.0))
> >
> > That would mean linking with -lm?
> 
> I guess so. Are we currently trying to avoid linking to the math-parts 
> of libc?

Yes.

I guess we could fix the overflow thing very easily, though:

static unsigned int digits_of_number(unsigned int number) {
	unsigned int result;
	for (result = 1; number; number /= 10, result++)
		; /* do nothing */
	return result;
}

Ciao,
Dscho

^ permalink raw reply

* Re: [PATCH] gitweb: Optimize git-favicon.png
From: Benjamin Kramer @ 2009-08-10 12:09 UTC (permalink / raw)
  To: Jakub Narebski; +Cc: git
In-Reply-To: <200908101357.49967.jnareb@gmail.com>

Reduce size of git-favicon.png using a combination of optipng and
pngout. From 164 bytes to 115 bytes (30% reduction). Also reduce
git-logo.png's size by one byte using advcomp.

Signed-off-by: Benjamin Kramer <benny.kra@googlemail.com>
---

Am 10.08.09 13:57, schrieb Jakub Narebski:
> 
> Can you optimize git-logo.png?  Smush.it wasn't able to do it, but
> perhaps different PNG optimization tool will reduce git-logo.png
> size...
> 

advcomp was able to shave one byte off git-logo.png. I don't know if
that's worth the effort.

 gitweb/git-favicon.png |  Bin 164 -> 115 bytes
 gitweb/git-logo.png    |  Bin 208 -> 207 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gitweb/git-favicon.png b/gitweb/git-favicon.png
index de637c0608090162a6ce6b51d5f9bfe512cf8bcf..aae35a70e70351fe6dcb3e905e2e388cf0cb0ac3 100644
GIT binary patch
delta 85
zcmZ3&SUf?+pEJNG#Pt9J149GD|NsBH{?u>)*{Yr{jv*Y^lOtGJcy4sCvGS>LGzvuT
nGSco!%*slUXkjQ0+{(x>@rZKt$^5c~Kn)C@u6{1-oD!M<s|Fj6

delta 135
zcmXS3!Z<;to+rR3#Pt9J149GDe=s<ftM(tr<t*@sEM{Qf76xHPhFNnYfP!|OE{-7;
zjI0MY3OYE5upapO?DR{I1pyyR7cx(jY7y^{FfMCvb5IaiQM`NJfeQjFwttKJyJNq@
hveI=@x=fAo=hV3$-MIWu9%vGSr>mdKI;RB2CICA_GnfDX

diff --git a/gitweb/git-logo.png b/gitweb/git-logo.png
index 16ae8d5382de5ffe63b54139245143513a87446e..f4ede2e944868b9a08401dafeb2b944c7166fd0a 100644
GIT binary patch
delta 156
zcmV;N0Av5q0nY)D7zqdi0002!DLE{WAt!%wNkl<Zc-rli(F%Yd6hp6fOaK3mORa}A
z2z1~>otGhl0|P~i$)-spEt!DmG!4Oj(E`y{=&}QVPE<oMZAOGbjq8K~(J6VKR=YOW
zicn}%Cu(Zk>Vav`S8+sy%-3K4v`F-e93n=ACyP7?a2n|X$Q?(91Ro%p-ctYo000O{
KMNUMnLSTYNOFs$#

delta 157
zcmV;O0Al~o0nh=E7zqRe0000j+0-qOAt!%xNkl<ZD9>X^XCMShTo?)nDq>S%AOZ*t
zX+^A|p#d-qlVCO`QjxI%5!T^VWNd8AY-|jo3~(x91}ec~9kT%fQ=|y!00S5%RuR<U
zAeS59v<@{SaVdhCFu0Qn5xGT(!HuAzL?H$zL4rVq!9|H6Z~*|MJt4&s9Gd<B000R9
LNkvXXu0mjfVZ1Yp

-- 
1.6.4.67.gea5b1
 

^ permalink raw reply

* Re: [PATCH] gitweb: Optimize git-favicon.png
From: Jakub Narebski @ 2009-08-10 11:57 UTC (permalink / raw)
  To: Benjamin Kramer; +Cc: git
In-Reply-To: <4A8006DD.30504@googlemail.com>

On Mon, 10 Aug 2009, Benjamin Kramer wrote:

> Reduce size of git-favicon.png using a combination of optipng and
> pngout. From 164 bytes to 115 bytes (30% reduction).
> 
> Signed-off-by: Benjamin Kramer <benny.kra@googlemail.com>
> ---
> 
> The contest is now open. Who can do better?
> 
>  gitweb/git-favicon.png |  Bin 164 -> 115 bytes
>  1 files changed, 0 insertions(+), 0 deletions(-)

Can you optimize git-logo.png?  Smush.it wasn't able to do it, but
perhaps different PNG optimization tool will reduce git-logo.png
size...

-- 
Jakub Narebski

Git User's Survey 2009
http://tinyurl.com/GitSurvey2009

^ permalink raw reply

* Re: .gitignore vs untracked working file
From: Johannes Sixt @ 2009-08-10 11:41 UTC (permalink / raw)
  To: Rostislav Svoboda; +Cc: git, Uwe Kleine-König
In-Reply-To: <286817520908100317k4e98faf9n4e852b7abd4719fe@mail.gmail.com>

Rostislav Svoboda schrieb:
> 2009/8/10 Uwe Kleine-König <u.kleine-koenig@pengutronix.de>:
>> Hello,
>>
>>> $ git checkout master
>>> error: Untracked working tree file 'Project/bin/path/file.jjt' would
>>> be overwritten by merge.
>> What is the output of
>>
>>        $ git ls-files master bin/
> 
> Nothing:

It should have been

	$ git ls-tree master bin

> BTW the rule to ignore bin/ is exclusively in the .gitignore on the
> branch mybranch not in the master branch. Might this be the problem?

It might be, depending on how precious Project/bin/path/file.jjt is for
you. Try this:

	$ git checkout -f master

This will overwrite the existing file with the version from master. If you
later

	$ git checkout mybranch

then the file will be *removed*.

-- Hannes

^ permalink raw reply

* Re: [PATCH] gitweb: Optimize git-favicon.png
From: Benjamin Kramer @ 2009-08-10 11:39 UTC (permalink / raw)
  To: Jakub Narebski; +Cc: git
In-Reply-To: <20090810110002.4448.88448.stgit@localhost.localdomain>

Reduce size of git-favicon.png using a combination of optipng and
pngout. From 164 bytes to 115 bytes (30% reduction).

Signed-off-by: Benjamin Kramer <benny.kra@googlemail.com>
---

The contest is now open. Who can do better?

 gitweb/git-favicon.png |  Bin 164 -> 115 bytes
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gitweb/git-favicon.png b/gitweb/git-favicon.png
index de637c0608090162a6ce6b51d5f9bfe512cf8bcf..aae35a70e70351fe6dcb3e905e2e388cf0cb0ac3 100644
GIT binary patch
delta 85
zcmZ3&SUf?+pEJNG#Pt9J149GD|NsBH{?u>)*{Yr{jv*Y^lOtGJcy4sCvGS>LGzvuT
nGSco!%*slUXkjQ0+{(x>@rZKt$^5c~Kn)C@u6{1-oD!M<s|Fj6

delta 135
zcmXS3!Z<;to+rR3#Pt9J149GDe=s<ftM(tr<t*@sEM{Qf76xHPhFNnYfP!|OE{-7;
zjI0MY3OYE5upapO?DR{I1pyyR7cx(jY7y^{FfMCvb5IaiQM`NJfeQjFwttKJyJNq@
hveI=@x=fAo=hV3$-MIWu9%vGSr>mdKI;RB2CICA_GnfDX

-- 
1.6.4.67.gea5b1

^ permalink raw reply

* Re: [PATCH] fix potential infinite loop given large unsigned integer
From: Erik Faye-Lund @ 2009-08-10 11:12 UTC (permalink / raw)
  To: Christian Couder; +Cc: Junio C Hamano, Ryan Flynn, git
In-Reply-To: <200908100724.53345.chriscool@tuxfamily.org>

On Mon, Aug 10, 2009 at 7:24 AM, Christian
Couder<chriscool@tuxfamily.org> wrote:
>> log10() appears to be C99, but can be emulated on earlier C-versions by
>> doing #define log10(x) (log(x) / log(10.0))
>
> That would mean linking with -lm?

I guess so. Are we currently trying to avoid linking to the math-parts of libc?

-- 
Erik "kusma" Faye-Lund
kusmabite@gmail.com
(+47) 986 59 656

^ permalink raw reply

* [PATCH] gitweb: Optimize git-favicon.png
From: Jakub Narebski @ 2009-08-10 11:00 UTC (permalink / raw)
  To: git

Reduce size of git-favicon.png using Smush.it(TM) online PNG optimizer
  http://developer.yahoo.com/yslow/smushit/
from 164 bytes to 118 bytes (28% reduction).

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
---
Smush.it(TM) could not improve git-logo.png

 gitweb/git-favicon.png |  Bin 164 -> 118 bytes
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/gitweb/git-favicon.png b/gitweb/git-favicon.png
index de637c0608090162a6ce6b51d5f9bfe512cf8bcf..1f8bfa70d674b1073a40ea66ba8c745dfdbaa59d 100644
GIT binary patch
delta 64
zcmZ3&ST@1NO4ZZFF@)oKas(?2&y5Z?Rz5Y3MuF&EM%rD8Sy?F(EeyqhTNxQ99#M`y
TnP0Y$0SG)@{an^LB{Ts5d%zSA

delta 110
zcmXS0!Z^VugR{URvY3H^TNs2H8D`CqU|?Xd^K@|xsbFM1xKYr-L4@_d*Jr0+dMpU|
zSh|pTqEw4`hlFuidz*uTz>4DC^A21PSh4+E+}|Dh9hQ}@lhS2sls~7={piN!fAT<+
O7(8A5T-G@yGywqcawy0E

^ permalink raw reply

* Re: backups with git
From: John Tapsell @ 2009-08-10 10:51 UTC (permalink / raw)
  To: Roald de Vries; +Cc: git
In-Reply-To: <41CB836B-6057-448E-805F-F25EAF765D27@roalddevries.nl>

2009/8/10 Roald de Vries <rdv@roalddevries.nl>:
> Dear all,
>
> I'm thinking of using git as a backup solution for my whole system, setting
> my $GIT_DIR to something like "/backupdisc/backup". Does that seem sensible?
> In his Google tech talk, Linus said that git was not good at huge projects;
> I guess that would apply to backups. On the other hand, maybe a backup
> doesn't need to be as fast as he wants git to be for projects. Has anybody
> used git like this? And was it a good experience?

Perhaps you want something more like btrfs.

John

^ permalink raw reply

* Re: .gitignore vs untracked working file
From: Rostislav Svoboda @ 2009-08-10 10:17 UTC (permalink / raw)
  To: git, Uwe Kleine-König
In-Reply-To: <20090810100148.GB22200@pengutronix.de>

2009/8/10 Uwe Kleine-König <u.kleine-koenig@pengutronix.de>:
> Hello,
>
>> $ git checkout master
>> error: Untracked working tree file 'Project/bin/path/file.jjt' would
>> be overwritten by merge.
> What is the output of
>
>        $ git ls-files master bin/

Nothing:

$ git ls-files master bin/
$ git ls-files master Project/bin/
$ git ls-files mybranch bin/
$ git ls-files mybranch Project/bin/

$ ll 'Project/bin/path/file.jjt'
-rw-r--r--    1 bost  Administ     8233 May 10  2006 Project/bin/path/file.jjt
$ git ls-files ''Project/bin/path/file.jjt'

BTW the rule to ignore bin/ is exclusively in the .gitignore on the
branch mybranch not in the master branch. Might this be the problem?

Bost

^ permalink raw reply

* Re: .gitignore vs untracked working file
From: Uwe Kleine-König @ 2009-08-10 10:01 UTC (permalink / raw)
  To: Rostislav Svoboda; +Cc: git
In-Reply-To: <286817520908100257n35b178ebu387161658554b4a@mail.gmail.com>

Hello,

> $ git checkout master
> error: Untracked working tree file 'Project/bin/path/file.jjt' would
> be overwritten by merge.
What is the output of

	$ git ls-files master bin/

?

Best regards
Uwe

-- 
Pengutronix e.K.                              | Uwe Kleine-König            |
Industrial Linux Solutions                    | http://www.pengutronix.de/  |

^ permalink raw reply

* .gitignore vs untracked working file
From: Rostislav Svoboda @ 2009-08-10  9:57 UTC (permalink / raw)
  To: git

Hi

I have a .gitignore rule to ignore everything in bin/ directories but
I cannot change branch because of a file lying in a bin/ directory
which actually should be ignored. What am I doing wrong?

$ git branch
  master
* mybranch

$ git status
# On branch mybranch
nothing to commit (working directory clean)

$ cat .gitignore
*.class
.cvsignore
CVS/
.metadata/
build/
bin/
.#*

$ git checkout master
error: Untracked working tree file 'Project/bin/path/file.jjt' would
be overwritten by merge.

$ git --version
git version 1.6.4.msysgit.0


thx

Bost

^ permalink raw reply

* Re: [PATCH 1/1] git-svn: ignore leading blank lines in svn:ignore
From: Eric Wong @ 2009-08-10  9:38 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git, Michael Haggerty, Adam Brewster
In-Reply-To: <e6857eacc53d862018138bd8d9e1ab778e8f5725.1249672562.git.mhagger@alum.mit.edu>

Michael Haggerty <mhagger@alum.mit.edu> wrote:
> Subversion ignores all blank lines in svn:ignore properties.  The old
> git-svn code ignored blank lines everywhere except for the first line
> of the svn:ignore property.  This patch makes the "git svn
> show-ignore" and "git svn create-ignore" commands ignore leading blank
> lines, too.
> 
> Also include leading blank lines in the test suite.
> 
> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>

Thanks Michael,

Acked out and pushed out along with two of Adam's to
git://yhbt.net/git-svn:

Adam Brewster (2):
      svn: Add && to t9107-git-svn-migrate.sh
      svn: Honor --prefix option in init without --stdlayout

Michael Haggerty (1):
      git-svn: ignore leading blank lines in svn:ignore

-- 
Eric Wong

^ permalink raw reply

* Re: [PATCH v4 0/5] Re: {checkout,reset,stash} --patch
From: Thomas Rast @ 2009-08-10  9:36 UTC (permalink / raw)
  To: Nicolas Sebrecht
  Cc: Jeff King, git, Junio C Hamano, Sverre Rabbelier,
	Nanako Shiraishi
In-Reply-To: <20090809222658.GB12932@vidovic>

Nicolas Sebrecht wrote:
> 
> Ok. All of what you say above makes sense and I'm actually fine with
> your whole answer. That said,
> 
>   % git checkout -p HEAD
> 
> and
> 
>   % git checkout -p HEAD -- file
> 
> behave differently here in my test above.

Oh.  Sorry, that's indeed a bug, I'll fix this.  (The -- file form
loses the HEAD when invoking add--interactive.)

-- 
Thomas Rast
trast@{inf,student}.ethz.ch

^ permalink raw reply

* Re: [PATCH v3 3/8] wt-status: move wt_status_colors[] into wt_status structure
From: Jeff King @ 2009-08-10  9:12 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git
In-Reply-To: <1249894465-11018-4-git-send-email-gitster@pobox.com>

On Mon, Aug 10, 2009 at 01:54:20AM -0700, Junio C Hamano wrote:

> @@ -37,6 +38,7 @@ struct wt_status {
>  	int wt_status_relative_paths;
>  	int wt_status_submodule_summary;
>  	enum untracked_status_type show_untracked_files;
> +	char wt_status_colors[6][COLOR_MAXLEN];

Yuck on the magic "6". It should be safe to use

  ARRAY_SIZE(wt_status_colors_default)

since that is computed purely from sizeof's. Though I am not discounting
the possibility that there are compilers which will screw it up.

-Peff

^ permalink raw reply

* Re: [PATCH v3 2/8] wt-status: move many global settings to wt_status structure
From: Jeff King @ 2009-08-10  9:10 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git
In-Reply-To: <1249894465-11018-3-git-send-email-gitster@pobox.com>

On Mon, Aug 10, 2009 at 01:54:19AM -0700, Junio C Hamano wrote:

> --- a/wt-status.h
> +++ b/wt-status.h
> [...]
> @@ -33,8 +32,12 @@ struct wt_status {
>  	const char *reference;
>  	int verbose;
>  	int amend;
> -	int untracked;
>  	int nowarn;
> +	int wt_status_use_color;
> +	int wt_status_relative_paths;
> +	int wt_status_submodule_summary;
> +	enum untracked_status_type show_untracked_files;
> +

Is there a particular reason to use such enormous struct member names?
IOW, inside wt_status, why not just "use_color"?

Other than that, I think this is a very positive change (and in fact, I
like the way this whole series is shaping up).

-Peff

^ permalink raw reply

* Re: [PATCH v2] push: point to 'git pull' and 'git push --force' in case of non-fast forward
From: Matthieu Moy @ 2009-08-10  8:56 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: Teemu Likonen, git
In-Reply-To: <7v1vnk3vgc.fsf@alter.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

> Matthieu Moy <Matthieu.Moy@imag.fr> writes:
>
>> Junio C Hamano <gitster@pobox.com> writes:
>>
>>> If you read "Integrate them with your changes" and understand that it is
>>> talking about "git pull" or "git pull --rebase", then you do not have to
>>> read the doc.  It should "click".
>>
>> But what's the point is being so vague, while you could just add "(see
>> git pull)"? See what you've just wrote: one should "understand that it
>> is about ...". So, why write Y thinking that the user should
>> understand that it is about X while you could write X directly?
>
> In order to cover both "pull" and "pull --rebase"?

"git pull" also covers both. "pull" is the command, "--rebase" is an
option of it.

-- 
Matthieu

^ permalink raw reply

page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox