From 5bb8eed38993f155fdc65ed4b016b2139ee2649f Mon Sep 17 00:00:00 2001
From: Steffen Prohaska <prohaska@zib.de>
Date: Sat, 26 Jul 2008 11:56:57 +0200
Subject: [PATCH] Switch to new 'libexec/git-core' directory layout

Git 1.6.0 will no longer place the dashed forms in 'bin' but
in 'libexec/git-core'.

This commit adjusts msysgit to support the new directory layout.
It also updates the git subproject to the first commit that
installs programs in the new location.  Note that this commit
only makes the basic adjustments.  A separate commit will modify
the installer.

Signed-off-by: Steffen Prohaska <prohaska@zib.de>
---
 .gitignore                                                    | 1 +
 git                                                           | 2 +-
 {bin => libexec/git-core}/git-format-patch.exe.manifest       | 0
 {bin => libexec/git-core}/git-patch-id.exe.manifest           | 0
 {bin => libexec/git-core}/git-update-index.exe.manifest       | 0
 {bin => libexec/git-core}/git-update-ref.exe.manifest         | 0
 {bin => libexec/git-core}/git-update-server-info.exe.manifest | 0
 7 files changed, 2 insertions(+), 1 deletion(-)
 rename {bin => libexec/git-core}/git-format-patch.exe.manifest (100%)
 rename {bin => libexec/git-core}/git-patch-id.exe.manifest (100%)
 rename {bin => libexec/git-core}/git-update-index.exe.manifest (100%)
 rename {bin => libexec/git-core}/git-update-ref.exe.manifest (100%)
 rename {bin => libexec/git-core}/git-update-server-info.exe.manifest (100%)

diff --git a/.gitignore b/.gitignore
index 9a9775ec..9e751e75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 /bin/git*
 /bin/cpio
 /home
+libexec/git-core
 /share/git-gui
 /share/gitk
 /share/git-core
diff --git a/git b/git
index 76fbe95f..1ddfb58a 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 76fbe95f5e2a38ce442fdde3db3f0cc0856d31c7
+Subproject commit 1ddfb58a5edcbdaf7371fe0036026c57aeed6a2c
diff --git a/bin/git-format-patch.exe.manifest b/libexec/git-core/git-format-patch.exe.manifest
similarity index 100%
rename from bin/git-format-patch.exe.manifest
rename to libexec/git-core/git-format-patch.exe.manifest
diff --git a/bin/git-patch-id.exe.manifest b/libexec/git-core/git-patch-id.exe.manifest
similarity index 100%
rename from bin/git-patch-id.exe.manifest
rename to libexec/git-core/git-patch-id.exe.manifest
diff --git a/bin/git-update-index.exe.manifest b/libexec/git-core/git-update-index.exe.manifest
similarity index 100%
rename from bin/git-update-index.exe.manifest
rename to libexec/git-core/git-update-index.exe.manifest
diff --git a/bin/git-update-ref.exe.manifest b/libexec/git-core/git-update-ref.exe.manifest
similarity index 100%
rename from bin/git-update-ref.exe.manifest
rename to libexec/git-core/git-update-ref.exe.manifest
diff --git a/bin/git-update-server-info.exe.manifest b/libexec/git-core/git-update-server-info.exe.manifest
similarity index 100%
rename from bin/git-update-server-info.exe.manifest
rename to libexec/git-core/git-update-server-info.exe.manifest