gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 38664: Fix the auto_rebase script 

I had the tidy.pl script with correct +x permission during my testing
session. Now we retrieve it from main, write its content into a
temporary file. It does not have the +x bit.
This commit is contained in:
Jonathan Druart 2025-02-11 21:03:42 +01:00
parent 93eda45a9e
commit aea905f704
No known key found for this signature in database
GPG Key ID: A085E712BEF0E0F0
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
misc/devel/auto_rebase.pl
View File

@ -167,7 +167,7 @@ FILE: while ( my ( $ii, $file ) = each @modified_files ) {
write_file( $file, join "\n", @content );
# Tidy the file
my $cmd = "$conflict_resolver_script $file";
my $cmd = "perl $conflict_resolver_script $file";
try {
system $cmd;
} catch {
@ -240,6 +240,11 @@ The source branch is the branch that is currently checked out.
=head1 EXAMPLES
First you need to retrieve this script from the main branch, do not place it under misc/devel/auto_rebase.pl or you will get an error (`The following untracked working tree files would be overwritten by checkout`).
git show origin/main:misc/devel/auto_rebase.pl > auto_rebase.pl
chmod +x auto_rebase.pl
Rebase onto 'main' in the current repository:
./auto_rebase.pl