The "commit" command is now also auto-invoked by "merge" command, whe…

…n custom working directory was specified
console-helpers · Jan 30, 2025 · 5c670f0 · 5c670f0
1 parent bf8fadf
commit 5c670f0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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 ...'));