Skip to content

Commit 5c670f0

Browse files
committed
The "commit" command is now also auto-invoked by "merge" command, when custom working directory was specified
1 parent bf8fadf commit 5c670f0

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
1212

1313
### Fixed
1414
- Handle cases, when `svn log ... --use-merge-history ...` command timeout-out.
15+
- The `merge` command wasn't doing auto-commit, when alternative working directly was specified.
1516

1617
## [0.8.0] - 2024-12-18
1718
### Added

src/SVNBuddy/Command/MergeCommand.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -863,11 +863,12 @@ protected function performCommit()
863863
if ( $auto_commit ) {
864864
$auto_deploy = $this->io->getOption('auto-deploy');
865865

866+
$commit_arguments = array(
867+
'path' => $this->io->getArgument('path'),
868+
);
869+
866870
if ( $auto_deploy !== null ) {
867-
$commit_arguments = array('--auto-deploy' => $auto_deploy);
868-
}
869-
else {
870-
$commit_arguments = array();
871+
$commit_arguments['--auto-deploy'] = $auto_deploy;
871872
}
872873

873874
$this->io->writeln(array('', 'Commencing automatic commit after merge ...'));

0 commit comments

Comments
 (0)