Summary: | Auto-rebase script does not deal correctly with deleted files | ||
---|---|---|---|
Product: | Koha | Reporter: | Jonathan Druart <jonathan.druart> |
Component: | Architecture, internals, and plumbing | Assignee: | Jonathan Druart <jonathan.druart> |
Status: | Pushed to main --- | QA Contact: | Baptiste Wojtkowski (bwoj) <baptiste.wojtkowski> |
Severity: | normal | ||
Priority: | P5 - low | CC: | baptiste.wojtkowski, nick |
Version: | Main | ||
Hardware: | All | ||
OS: | All | ||
Change sponsored?: | --- | Patch complexity: | --- |
Documentation contact: | Documentation submission: | ||
Text to go in the release notes: | Version(s) released in: |
25.05.00
|
|
Circulation function: | |||
Bug Depends on: | 38664 | ||
Bug Blocks: | |||
Attachments: |
Bug 39114: The auto-rebase script - Fix files removal
Bug 39114: The auto-rebase script - Fix files removal Bug 39114: The auto-rebase script - Fix files removal Bug 39114: The auto-rebase script - Fix files removal Bug 39114: The auto-rebase script - Fix files removal Bug 39114: The auto-rebase script - Fix files removal |
Description
Jonathan Druart
2025-02-12 19:10:18 UTC
Created attachment 177970 [details] [review] Bug 39114: The auto-rebase script - Fix files removal It's using `$git->rm($file)` but this does not work. Test plan: git checkout HEAD~100 (so you are before 38664) git rm mainpage.pl edit C4/Auth.pm and make some changes git commit -a --no-verify -m"Bug 12345: test" then rebase your branch Retrieve the auto_rebase.pl version from this patch and run it perl auto_rebase.pl The resulted commit should not contain mainpage.pl Created attachment 177986 [details] [review] Bug 39114: The auto-rebase script - Fix files removal It's using `$git->rm($file)` but this does not work. Test plan: git checkout HEAD~100 (so you are before 38664) git rm mainpage.pl edit C4/Auth.pm and make some changes git commit -a --no-verify -m"Bug 12345: test" then rebase your branch Retrieve the auto_rebase.pl version from this patch and run it perl auto_rebase.pl The resulted commit should not contain mainpage.pl Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> Created attachment 177988 [details] [review] Bug 39114: The auto-rebase script - Fix files removal Wrong handling of the return of the try-catch, $git->rm has an output ("rm /file/path"). This patch retrieves the status from the `git diff-tree` output Test plan: git checkout HEAD~100 (so you are before 38664) git rm mainpage.pl edit C4/Auth.pm and make some changes git commit -a --no-verify -m"Bug 12345: test" then rebase your branch Retrieve the auto_rebase.pl version from this patch and run it perl auto_rebase.pl The resulted commit should not contain mainpage.pl Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> Thanks Matt! Created attachment 177989 [details] [review] Bug 39114: The auto-rebase script - Fix files removal Wrong handling of the return of the try-catch, $git->rm has an output ("rm /file/path"). This patch retrieves the status from the `git diff-tree` output Test plan: git checkout HEAD~100 (so you are before 38664) git rm mainpage.pl edit C4/Auth.pm and make some changes git commit -a --no-verify -m"Bug 12345: test" then rebase your branch Retrieve the auto_rebase.pl version from this patch and run it perl auto_rebase.pl The resulted commit should not contain mainpage.pl Created attachment 178012 [details] [review] Bug 39114: The auto-rebase script - Fix files removal Wrong handling of the return of the try-catch, $git->rm has an output ("rm /file/path"). This patch retrieves the status from the `git diff-tree` output Test plan: git checkout HEAD~100 (so you are before 38664) git rm mainpage.pl edit C4/Auth.pm and make some changes git commit -a --no-verify -m"Bug 12345: test" then rebase your branch Retrieve the auto_rebase.pl version from this patch and run it perl auto_rebase.pl The resulted commit should not contain mainpage.pl WNC amended patch, tidied, ironically Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Not sure why Matt's sign off got lost, but feel free to move to PQA and add it back (In reply to Nick Clemens (kidclamp) from comment #7) > Not sure why Matt's sign off got lost, but feel free to move to PQA and add > it back He tested a previous version of the patch. Created attachment 178035 [details] [review] Bug 39114: The auto-rebase script - Fix files removal Wrong handling of the return of the try-catch, $git->rm has an output ("rm /file/path"). This patch retrieves the status from the `git diff-tree` output Test plan: git checkout HEAD~100 (so you are before 38664) git rm mainpage.pl edit C4/Auth.pm and make some changes git commit -a --no-verify -m"Bug 12345: test" then rebase your branch Retrieve the auto_rebase.pl version from this patch and run it perl auto_rebase.pl The resulted commit should not contain mainpage.pl WNC amended patch, tidied, ironically Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Baptiste Wojtkowski <baptiste.wojtkowski@biblibre.com> Pushed for 25.05! Well done everyone, thank you! |