diff options
| author | Benjamin Poirier <bpoirier@suse.de> | 2012-12-13 18:03:33 +0100 |
|---|---|---|
| committer | Jean Delvare <jdelvare@suse.de> | 2012-12-13 18:03:33 +0100 |
| commit | 6cc63d0c2289f80c303780fd9b92d4af8c539002 (patch) | |
| tree | 428a987376a83a3d548f72620375ebacca4705f7 | |
| parent | 6c4be0512ef99f49d9535bc32cd0d595d7830ffd (diff) | |
| download | quilt-6cc63d0c2289f80c303780fd9b92d4af8c539002.tar.gz | |
pop: Harmonize `patch --force` usage between push and pop
push:apply_patch() uses --force by default but pop:check_for_pending_changes()
does not. This leads to a problem when trying to pop a patch that changes
files which were originally read-only: patch refuses to touch them.
| -rw-r--r-- | quilt/pop.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/quilt/pop.in b/quilt/pop.in index 17dc2b4..a1bfc3c 100644 --- a/quilt/pop.in +++ b/quilt/pop.in @@ -108,7 +108,7 @@ check_for_pending_changes() if ! cat_file "$patch_file" \ | patch -d $workdir $QUILT_PATCH_OPTS \ $(patch_args "$patch") \ - --no-backup-if-mismatch -E \ + --no-backup-if-mismatch -E -f \ >/dev/null 2>/dev/null then if ! [ -e "$QUILT_PC/$patch" ] |