diff options
| author | Jean Delvare <jdelvare@suse.de> | 2014-01-17 15:37:21 +0100 |
|---|---|---|
| committer | Jean Delvare <jdelvare@suse.de> | 2014-01-17 15:37:21 +0100 |
| commit | 63d447bbd17ccfa152e96132d187a3c8fcb9e1af (patch) | |
| tree | 209ed25b651ffe49c23536331962d05f86222e72 | |
| parent | f535e6f731668035a3fa2472628ba82146ea7262 (diff) | |
| download | quilt-63d447bbd17ccfa152e96132d187a3c8fcb9e1af.tar.gz | |
Stop using patch option -E
GNU patch version 2.5 and newer deals just fine with empty files,
however our use of option -E breaks this feature. So stop using this
option. Anyway, the manual page says: "Normally this option is
unnecessary" and the test suite passes just fine without it.
If anyone is using legacy patch formats which do require the use of
option -E, they can add it to QUILT_PATCH_OPTS to revert to the
previous behavior.
| -rw-r--r-- | quilt/fold.in | 2 | ||||
| -rw-r--r-- | quilt/pop.in | 2 | ||||
| -rw-r--r-- | quilt/push.in | 2 | ||||
| -rw-r--r-- | quilt/scripts/patchfns.in | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/quilt/fold.in b/quilt/fold.in index 0115d77..66e91fd 100644 --- a/quilt/fold.in +++ b/quilt/fold.in @@ -94,7 +94,7 @@ trap "failed=1" SIGINT workdir=$(gen_tempfile -d $PWD) patch -d ${SUBDIR:-.} $QUILT_PATCH_OPTS -p$opt_strip_level \ - --backup --prefix="$workdir/$SUBDIR" -E $patch_args \ + --backup --prefix="$workdir/$SUBDIR" $patch_args \ || failed=1 [ -n "$opt_force" ] && failed= diff --git a/quilt/pop.in b/quilt/pop.in index 4169fa3..651de62 100644 --- a/quilt/pop.in +++ b/quilt/pop.in @@ -108,7 +108,7 @@ check_for_pending_changes() cat_file "$patch_file" \ | patch -d $workdir $QUILT_PATCH_OPTS \ $(patch_args "$patch") --no-backup-if-mismatch \ - -E -f >/dev/null 2>/dev/null + -f >/dev/null 2>/dev/null fi local file file2 failed diff --git a/quilt/push.in b/quilt/push.in index 450edf1..cfad182 100644 --- a/quilt/push.in +++ b/quilt/push.in @@ -119,7 +119,7 @@ apply_patch() set -- patch $QUILT_PATCH_OPTS $(push_patch_args "$patch") \ --backup --prefix="$QUILT_PC/$patch/" \ - $no_reject_files -E $more_patch_args + $no_reject_files $more_patch_args if [ "${patch_file:(-3)}" = ".gz" ] then diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in index e89474f..43f5f71 100644 --- a/quilt/scripts/patchfns.in +++ b/quilt/scripts/patchfns.in @@ -897,7 +897,7 @@ apply_patch_temporarily() then if ! cat_file $patch_file \ | patch -d $workdir $QUILT_PATCH_OPTS $patch_args \ - --no-backup-if-mismatch -Ef \ + --no-backup-if-mismatch -f \ >/dev/null 2>/dev/null then # Generating a relative diff for a subset of files in |