From b7727fe73280161f2964e8fe5171b8404a25c7a2 Mon Sep 17 00:00:00 2001
From: Max Howell <mxcl@me.com>
Date: Mon, 16 Jan 2023 16:12:14 -0500
Subject: [PATCH] fix git libexec rpaths (#103)

The fix works by having the relative path component count be the same between bin and libexec
---
 projects/git-scm.org/config.mak  |  2 +-
 projects/git-scm.org/package.yml | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/projects/git-scm.org/config.mak b/projects/git-scm.org/config.mak
index d20025ac..03906047 100644
--- a/projects/git-scm.org/config.mak
+++ b/projects/git-scm.org/config.mak
@@ -2,4 +2,4 @@ RUNTIME_PREFIX = YesPlease
 RUNTIME_PREFIX_PERL = YesPlease
 
 # must be set or the above are still abs paths
-gitexecdir=libexec/git-core
+gitexecdir=libexec
diff --git a/projects/git-scm.org/package.yml b/projects/git-scm.org/package.yml
index 4c17c6f8..f18edc2f 100644
--- a/projects/git-scm.org/package.yml
+++ b/projects/git-scm.org/package.yml
@@ -22,9 +22,9 @@ build:
     make install $BAKE
 
     cd "{{prefix}}"
-    DEBUG=1 fix-shebangs.ts bin/* libexec/git-core/*
+    DEBUG=1 fix-shebangs.ts bin/* libexec/*
 
-    mkdir etc
+    mkdir -p etc
     cp "$SRCROOT"/props/git* etc
   env:
     V: 1
@@ -47,6 +47,13 @@ test: |
   git add .
   test "$(git diff --name-only --cached)" = "testfile"
 
+  # necessary so `git commit` will work
+  git config user.email "you@example.com"
+  git config user.name "Your Name"
+
+  # necessary to check the libexec binaries work
+  git commit --message "test"
+
 provides:
   - bin/git
   - bin/git-cvsserver