[5.x] Provide git binary var to commands array in config (#10154)

config/git.php

@@ -116,7 +116,7 @@
     |
     */
 
-    'binary' => $binary = env('STATAMIC_GIT_BINARY', 'git'),
+    'binary' => env('STATAMIC_GIT_BINARY', 'git'),
 
     /*
     |--------------------------------------------------------------------------
@@ -132,8 +132,8 @@
     */
 
     'commands' => [
-        $binary.' add {{ paths }}',
-        $binary.' -c "user.name={{ name }}" -c "user.email={{ email }}" commit -m "{{ message }}"',
+        '{{ git }} add {{ paths }}',
+        '{{ git }} -c "user.name={{ name }}" -c "user.email={{ email }}" commit -m "{{ message }}"',
     ],
 
     /*

src/Git/Git.php

@@ -254,6 +254,7 @@ protected function getParsedCommands($paths, $message)
     protected function getCommandContext($paths, $message)
     {
         return [
+            'git' => config('statamic.git.binary'),
             'paths' => collect($paths)->implode(' '),
             'message' => $this->shellEscape($message),
             'name' => $this->shellEscape($this->gitUserName()),

tests/Git/Concerns/PreparesTempRepos.php

@@ -38,7 +38,7 @@ protected function createTempRepo($path)
 
         $process = Process::create($path);
 
-        $process->run('git init');
+        $process->run('git init -b master');
         $process->run('git add --all');
         $process->run('git -c "user.name=Tests" -c "[email protected]" commit -m "Initial commit."');
 

tests/Git/GitTest.php

@@ -298,6 +298,33 @@ public function it_can_run_custom_commands()
 Spock committed.
 Spock committed.
 
+EOT;
+
+        $this->assertEquals($expectedLog, $this->files->get($logFile));
+    }
+
+    /** @test */
+    public function it_can_run_custom_commands_with_custom_git_binary()
+    {
+        $this->markTestSkippedInWindows();
+
+        $this->files->put($logFile = $this->basePath('temp/log.txt'), '');
+
+        Config::set('statamic.git.binary', 'the custom git binary');
+
+        Config::set('statamic.git.commands', [
+            'echo "{{ name }} committed using {{ git }}." >> '.$logFile,
+        ]);
+
+        Git::partialMock()
+            ->shouldReceive('groupTrackedContentPathsByRepo')
+            ->andReturn(collect([base_path('content') => collect(['foo'])]));
+
+        Git::commit();
+
+        $expectedLog = <<<'EOT'
+Spock committed using the custom git binary.
+
 EOT;
 
         $this->assertEquals($expectedLog, $this->files->get($logFile));