[Quilt-dev] [PATCH, RFC] Stop using patch option -E

[Jean Delvare]

GNU patch version 2.7 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.
---
Andreas, can you remember why we were using option -E? I dug the history
but apparently it has been there since the beginning so I couldn't find
an explanation. I suppose it may help get files deleted when using
QUILT_NO_DIFF_TIMESTAMPS? But OTOH I would hope that GNU patch notices
when the file name is /dev/null and acts appropriately.

 quilt/fold.in             |    2 +-
 quilt/pop.in              |    2 +-
 quilt/push.in             |    2 +-
 quilt/scripts/patchfns.in |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

--- quilt.orig/quilt/fold.in    2009-09-09 10:18:31.000000000 +0200
+++ quilt/quilt/fold.in 2012-12-16 13:35:49.691309289 +0100
@@ -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=
--- quilt.orig/quilt/pop.in     2012-12-16 11:17:48.000000000 +0100
+++ quilt/quilt/pop.in  2012-12-16 13:35:54.603314449 +0100
@@ -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
--- quilt.orig/quilt/push.in    2012-12-10 10:42:21.000000000 +0100
+++ quilt/quilt/push.in 2012-12-16 13:35:42.513301747 +0100
@@ -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
--- quilt.orig/quilt/scripts/patchfns.in        2012-12-10 10:42:21.000000000 
+0100
+++ quilt/quilt/scripts/patchfns.in     2012-12-16 13:36:03.042323316 +0100
@@ -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

-- 
Jean Delvare
Suse L3