From 80ace62abffb0d4e48b275647fa13ee522260863 Mon Sep 17 00:00:00 2001
From: Alexander Zhirov <alexander@zhirov.kz>
Date: Mon, 2 Jun 2025 00:59:27 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BA=D0=B0=D0=B7=D0=B0=D0=BD=20=D1=8F?=
 =?UTF-8?q?=D0=B2=D0=BD=D1=8B=D0=B9=20=D0=BF=D1=83=D1=82=D1=8C=20=D0=BA=20?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=87=D0=B5=D0=B9=20=D0=B4=D0=B8=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D0=B8=20=D0=BF=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B5=D0=BA=D1=82=D0=B0=20=D0=BF=D1=80=D0=B8=20=D0=B2=D1=8B?=
 =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B5=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4?=
 =?UTF-8?q?=D1=8B=20git,=20=D1=82=D0=B0=D0=BA=20=D0=BA=D0=B0=D0=BA=20?=
 =?UTF-8?q?=D0=B2=D1=8B=D0=B7=D0=BE=D0=B2=20snag=20=D0=B8=D0=B7=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=B4=20=D0=BD=D0=B5=20=D1=80=D0=B0=D0=B1=D0=BE=D1=87?=
 =?UTF-8?q?=D0=B5=D0=B9=20=D0=B4=D0=B8=D1=80=D0=B5=D0=BA=D1=82=D0=BE=D1=80?=
 =?UTF-8?q?=D0=B8=D0=B8=20=D0=BD=D0=B5=20=D0=B2=D1=8B=D0=BF=D0=BE=D0=BB?=
 =?UTF-8?q?=D0=BD=D1=8F=D0=BB=20=D0=BD=D0=B5=D0=BA=D0=BE=D1=82=D0=BE=D1=80?=
 =?UTF-8?q?=D1=8B=D0=B5=20=D0=BE=D0=BF=D0=B5=D1=80=D0=B0=D1=86=D0=B8=D0=B8?=
 =?UTF-8?q?=20=D0=BD=D0=B0=20=D1=81=D1=82=D0=B0=D1=80=D1=8B=D1=85=20=D0=B2?=
 =?UTF-8?q?=D0=B5=D1=80=D1=81=D0=B8=D1=8F=D1=85=20git?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/snag/core/core.d  | 8 ++++----
 source/snag/core/rules.d | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/snag/core/core.d b/source/snag/core/core.d
index 62150fc..7f5f9a1 100644
--- a/source/snag/core/core.d
+++ b/source/snag/core/core.d
@@ -22,8 +22,8 @@ class Snag {
 
 	this(SnagConfig config) {
 		_baseCommand = format(
-			"git --git-dir=%s --work-tree=%s",
-			config.git, config.project
+			"git -C %s --git-dir=%s --work-tree=%s",
+			config.project, config.git, config.project
 		).split();
 
 		_config = config;
@@ -381,8 +381,8 @@ class Snag {
 
 		// Выполнение git команд относительно распакованного архива
 		string[] customCommand = format(
-			"git --git-dir=%s --work-tree=%s",
-			_config.git, tempDirectory
+			"git -C %s --git-dir=%s --work-tree=%s",
+			tempDirectory, _config.git, tempDirectory
 		).split();
 
 		// Необходимо проверить, что текущее состояние файлов не идентично файлам распакованного архива
diff --git a/source/snag/core/rules.d b/source/snag/core/rules.d
index d8a2c9c..85fca40 100644
--- a/source/snag/core/rules.d
+++ b/source/snag/core/rules.d
@@ -75,8 +75,8 @@ class SnagRules {
 		_gitignoreBak = _gitignore ~ ".bak";
 
 		_baseCommand = format(
-			"git --git-dir=%s --work-tree=%s",
-			config.git, config.project
+			"git -C %s --git-dir=%s --work-tree=%s",
+			config.project, config.git, config.project
 		).split();
 
 		generate();