From 62d53007cc96d488f1b108118bbb6568f93041e8 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Fri, 3 Sep 2021 17:01:56 +0200 Subject: import: Fix option -P I broke "import -P" with my previous commit. Using this option now fails with the following error message: /usr/share/quilt/import: line 168: [: missing `]' This is caused by a missing space before the closing square bracket, which prevents bash from parsing the line. Fix that, and add a test case to cover this code path, so that no such bug can creep in in the future. Signed-off-by: Jean Delvare Fixes: c539338458e4 ("Delay sourcing patchfns until options have been processed") --- test/import.test | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'test/import.test') diff --git a/test/import.test b/test/import.test index e9cc85b..466d808 100644 --- a/test/import.test +++ b/test/import.test @@ -255,3 +255,19 @@ > Importing patch ../empty.patch (stored as %{_P}empty.patch) $ quilt import %{PWD}/empty2.patch > Importing patch %{PWD}/empty2.patch (stored as %{_P}empty2.patch) + +# Test importing under a different name + $ cd .. + $ quilt delete -rn + > Removed patch %{P}empty2.patch + $ quilt delete -rn + > Removed patch %{P}empty.patch + $ quilt import t/patch1.diff -P patch1-renamed.diff + > Importing patch t/patch1.diff (stored as %{P}patch1-renamed.diff) + $ quilt push + > Applying patch %{P}patch1-renamed.diff + > patching file f + > + > Now at patch patches/patch1-renamed.diff + $ cat f + > f -- cgit