diff options
| author | Jean Delvare <jdelvare@suse.de> | 2013-05-23 08:30:26 +0200 |
|---|---|---|
| committer | Jean Delvare <jdelvare@suse.de> | 2013-05-23 08:30:26 +0200 |
| commit | e2e58301e8379a9d67fe308a3c1cdcf8b0b35538 (patch) | |
| tree | 287c203290d78644d0c16eb77b0e4d59751c43e1 | |
| parent | cbbe90be67049522705b85d2c568f160b466c309 (diff) | |
| download | quilt-e2e58301e8379a9d67fe308a3c1cdcf8b0b35538.tar.gz | |
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.
| -rw-r--r-- | quilt.changes | 5 | ||||
| -rw-r--r-- | quilt/patches.in | 2 | ||||
| -rw-r--r-- | test/two.test | 14 |
3 files changed, 20 insertions, 1 deletions
diff --git a/quilt.changes b/quilt.changes index bfe89da..5be2e17 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +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 - patches: Fix shift in scan_unapplied. 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 |