From e2e58301e8379a9d67fe308a3c1cdcf8b0b35538 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Thu, 23 May 2013 08:30:26 +0200 Subject: patches: Match deleted files in unapplied patches Let "quilt patches" also match deleted files in unapplied patches. Commit 4df47975 was supposed to fix that already, but did not really. --- quilt.changes | 5 +++++ quilt/patches.in | 2 +- test/two.test | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/quilt.changes b/quilt.changes index bfe89da..5be2e17 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 23 08:29:24 CEST 2013 - jdelvare@suse.de + +- patches: Also match deleted files in unapplied patches. + ------------------------------------------------------------------- Wed May 22 10:54:08 CEST 2013 - jdelvare@suse.de diff --git a/quilt/patches.in b/quilt/patches.in index 8c60ac1..ccbf247 100644 --- a/quilt/patches.in +++ b/quilt/patches.in @@ -63,7 +63,7 @@ touched_by_patch() [ $strip = ab ] && strip=1 cat_file $(patch_file_name $patch) \ | awk ' - /^\+\+\+[ \t]/ { + /^(\+\+\+|---)[ \t]/ { sub(/^(\+\+\+|---)[ \t]/, "") sub(/[ \t][^ \t]*$/, "") sub(/^\/dev\/null/, "") diff --git a/test/two.test b/test/two.test index 5863ac9..3698e9f 100644 --- a/test/two.test +++ b/test/two.test @@ -160,3 +160,17 @@ > Removing patch %{_P}patch2.diff > Removing patch %{_P}patch1.diff > No patches applied + + $ quilt patches file4 + > %{_P}patch1.diff + > %{_P}subdir/patch3.diff + + $ quilt push -qa + > Applying patch %{_P}patch1.diff + > Applying patch %{_P}patch2.diff + > Applying patch %{_P}subdir/patch3.diff + > Now at patch %{_P}subdir/patch3.diff + + $ quilt patches file4 + > %{_P}patch1.diff + > %{_P}subdir/patch3.diff -- cgit