[Bug 39114] New: Auto-rebase script does not deal correctly with deleted files
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39114 Bug ID: 39114 Summary: Auto-rebase script does not deal correctly with deleted files Change sponsored?: --- Product: Koha Version: unspecified Hardware: All OS: All Status: NEW Severity: enhancement Priority: P5 - low Component: Architecture, internals, and plumbing Assignee: koha-bugs@lists.koha-community.org Reporter: jonathan.druart@gmail.com QA Contact: testopia@bugs.koha-community.org Depends on: 38664 It's using `$git->rm($file)` but this does not work. Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 [Bug 38664] Tidy the whole codebase -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39114 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |Needs Signoff -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39114 --- Comment #1 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 177970 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=177970&action=edit 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 -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39114 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |ASSIGNED -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39114 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Assignee|koha-bugs@lists.koha-commun |jonathan.druart@gmail.com |ity.org | Severity|enhancement |normal -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39114 Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |Signed Off -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39114 Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #177970|0 |1 is obsolete| | --- Comment #2 from Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> --- Created attachment 177986 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=177986&action=edit 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> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39114 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #177986|0 |1 is obsolete| | --- Comment #3 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 177988 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=177988&action=edit 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> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39114 --- Comment #4 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Thanks Matt! -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39114 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Version|unspecified |Main -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39114 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39114 Jonathan Druart <jonathan.druart@gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #177988|0 |1 is obsolete| | --- Comment #5 from Jonathan Druart <jonathan.druart@gmail.com> --- Created attachment 177989 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=177989&action=edit 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 -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39114 Nick Clemens (kidclamp) <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39114 Nick Clemens (kidclamp) <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #177989|0 |1 is obsolete| | --- Comment #6 from Nick Clemens (kidclamp) <nick@bywatersolutions.com> --- Created attachment 178012 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=178012&action=edit 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> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39114 Nick Clemens (kidclamp) <nick@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |nick@bywatersolutions.com --- Comment #7 from Nick Clemens (kidclamp) <nick@bywatersolutions.com> --- Not sure why Matt's sign off got lost, but feel free to move to PQA and add it back -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39114 --- Comment #8 from Jonathan Druart <jonathan.druart@gmail.com> --- (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. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39114 Baptiste Wojtkowski (bwoj) <baptiste.wojtkowski@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |baptiste.wojtkowski@biblibr | |e.com QA Contact|testopia@bugs.koha-communit |baptiste.wojtkowski@biblibr |y.org |e.com -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39114 Baptiste Wojtkowski (bwoj) <baptiste.wojtkowski@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Passed QA -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39114 Baptiste Wojtkowski (bwoj) <baptiste.wojtkowski@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #178012|0 |1 is obsolete| | --- Comment #9 from Baptiste Wojtkowski (bwoj) <baptiste.wojtkowski@biblibre.com> --- Created attachment 178035 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=178035&action=edit 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> -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39114 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Version(s)| |25.05.00 released in| | Status|Passed QA |Pushed to main -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39114 --- Comment #10 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Pushed for 25.05! Well done everyone, thank you! -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39114 Baptiste Wojtkowski (bwoj) <baptiste.wojtkowski@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to main |Needs documenting --- Comment #11 from Baptiste Wojtkowski (bwoj) <baptiste.wojtkowski@biblibre.com> --- Depends on tidying, not pushed -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39114 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |david@davidnind.com Resolution|--- |FIXED Status|Needs documenting |RESOLVED --- Comment #12 from David Nind <david@davidnind.com> --- No changes to the manual required. -- You are receiving this mail because: You are watching all bug changes.
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39114 Bug 39114 depends on bug 38664, which changed state. Bug 38664 Summary: Tidy the whole codebase https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=38664 What |Removed |Added ---------------------------------------------------------------------------- Status|Needs documenting |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are watching all bug changes.
participants (1)
-
bugzilla-daemon＠bugs.koha-community.org