From 5c670f08191b1412cdf573366557f6b6cad23c8e Mon Sep 17 00:00:00 2001
From: Alex <aik099@users.noreply.github.com>
Date: Thu, 30 Jan 2025 18:33:39 +0200
Subject: [PATCH] The "commit" command is now also auto-invoked by "merge"
 command, when custom working directory was specified

---
 CHANGELOG.md                          | 1 +
 src/SVNBuddy/Command/MergeCommand.php | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ddb7c2..51d6fcb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 - Handle cases, when `svn log ... --use-merge-history ...` command timeout-out.
+- The `merge` command wasn't doing auto-commit, when alternative working directly was specified.
 
 ## [0.8.0] - 2024-12-18
 ### Added
diff --git a/src/SVNBuddy/Command/MergeCommand.php b/src/SVNBuddy/Command/MergeCommand.php
index 69cefc9..0c8c0f1 100644
--- a/src/SVNBuddy/Command/MergeCommand.php
+++ b/src/SVNBuddy/Command/MergeCommand.php
@@ -863,11 +863,12 @@ protected function performCommit()
 		if ( $auto_commit ) {
 			$auto_deploy = $this->io->getOption('auto-deploy');
 
+			$commit_arguments = array(
+				'path' => $this->io->getArgument('path'),
+			);
+
 			if ( $auto_deploy !== null ) {
-				$commit_arguments = array('--auto-deploy' => $auto_deploy);
-			}
-			else {
-				$commit_arguments = array();
+				$commit_arguments['--auto-deploy'] = $auto_deploy;
 			}
 
 			$this->io->writeln(array('', 'Commencing automatic commit after merge ...'));