From 2e16754fffecb5cef5a62009b0f00461d706db13 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 11 Feb 2025 21:03:42 +0100 Subject: [PATCH] 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. --- misc/devel/auto_rebase.pl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/misc/devel/auto_rebase.pl b/misc/devel/auto_rebase.pl index ab28e42a73e..ede46b931d4 100755 --- a/misc/devel/auto_rebase.pl +++ b/misc/devel/auto_rebase.pl @@ -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 -- 2.34.1