File tree Expand file tree Collapse file tree 2 files changed +6
-4
lines changed Expand file tree Collapse file tree 2 files changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
12
12
13
13
### Fixed
14
14
- 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.
15
16
16
17
## [ 0.8.0] - 2024-12-18
17
18
### Added
Original file line number Diff line number Diff line change @@ -863,11 +863,12 @@ protected function performCommit()
863
863
if ( $ auto_commit ) {
864
864
$ auto_deploy = $ this ->io ->getOption ('auto-deploy ' );
865
865
866
+ $ commit_arguments = array (
867
+ 'path ' => $ this ->io ->getArgument ('path ' ),
868
+ );
869
+
866
870
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 ;
871
872
}
872
873
873
874
$ this ->io ->writeln (array ('' , 'Commencing automatic commit after merge ... ' ));
You can’t perform that action at this time.
0 commit comments