- Try to clean up the force-apply and interactive-apply logic

  in quilt push, and add a force option to quilt fold: Fold was
  applying patches interactively and was restoring files if there
  were rejects; this was very unexpected for users.

7 files changed, 126 insertions, 97 deletions

diff --git a/po/de.po b/po/de.po
index b734308..f302bdb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -401,6 +401,11 @@ msgid ""
 "patch, the patch is applied with the specified strip level (which\n"
 "defaults to 1).\n"
 "\n"
+"-q\tQuiet operation.\n"
+"\n"
+"-f\tForce apply, even if the patch has rejects. Unless in quiet mode,\n"
+"\tapply the patch interactively: the patch utility may ask questions.\n"
+"\n"
 "-p strip-level\n"
 "\tThe number of pathname components to strip from file names\n"
 "\twhen applying patchfile.\n"
@@ -411,11 +416,17 @@ msgstr ""
 "obersten Patch enthalten sind, und wendet dann den neuen Patch\n"
 "mit der angegebenen Anzahl an Strip-Ebenen an (Standardwert = 1).\n"
 "\n"
+"-q\tWenige Meldungen ausgeben.\n"
+"\n"
+"-f\tAnwenden erzwingen, selbst wenn dabei Fehler auftreten. Wenn -q nicht\n"
+"\tangegeben wird der Patch interaktiv angewandt, und das Patch-Utility\n"
+"\tkann fragen stellen.\n"
+"\n"
 "-p strip-ebenen\n"
 "\tDie Anzahl der Komponenten im Pfadnamen, die beim Anwenden des Patches\n"
 "\tentfernt werden sollen.\n"
 
-#: quilt/fold.in:112
+#: quilt/fold.in:123
 msgid "File %s may be corrupted\\n"
 msgstr "Datei %s ist möglicherweise defekt\\n"
 
@@ -960,7 +971,7 @@ msgstr "Kein Patch entfernt\\n"
 msgid "No patches applied\\n"
 msgstr "Keine Patches angewandt\\n"
 
-#: quilt/pop.in:274 quilt/push.in:373
+#: quilt/pop.in:274 quilt/push.in:369
 msgid "Now at patch %s\\n"
 msgstr "Jetzt in Patch %s\\n"
 
@@ -980,11 +991,11 @@ msgstr ""
 
 #: quilt/push.in:24
 msgid ""
-"Usage: quilt push [-afqv] [--leave-rejects] [--interactive] [--color[=always|"
-"auto|never]] [num|patch]\\n"
+"Usage: quilt push [-afqv] [--leave-rejects] [--color[=always|auto|never]] "
+"[num|patch]\\n"
 msgstr ""
-"Verwendung: quilt push [-afqv] [--leave-rejects] [--interactive] [--color"
-"[=always|auto|never]] [num|patch]\\n"
+"Verwendung: quilt push [-afqv] [--leave-rejects] [--color[=always|auto|"
+"never]] [num|patch]\\n"
 
 #: quilt/push.in:27
 msgid ""
@@ -998,21 +1009,17 @@ msgid ""
 "\n"
 "-a\tApply all patches in the series file.\n"
 "\n"
-"-f\tForce apply, even if the patch has rejects.\n"
-"\n"
 "-q\tQuiet operation.\n"
 "\n"
+"-f\tForce apply, even if the patch has rejects. Unless in quiet mode,\n"
+"\tapply the patch interactively: the patch utility may ask questions.\n"
+"\n"
 "-v\tVerbose operation.\n"
 "\n"
 "--leave-rejects\n"
 "\tLeave around the reject files patch produced, even if the patch\n"
 "\tis not actually applied.\n"
 "\n"
-"--interactive\n"
-"\tAllow the patch utility to ask how to deal with conflicts. If\n"
-"\tthis option is not given, the -f option will be passed to the\n"
-"\tpatch program.\n"
-"\n"
 "--color[=always|auto|never]\n"
 "\tUse syntax coloring.\n"
 msgstr ""
@@ -1025,52 +1032,50 @@ msgstr ""
 "\n"
 "-a\tAlle folgenden Patches anwenden.\n"
 "\n"
-"-f\tAnwenden erzwingen, solbst wenn dabei Fehler (Rejects) auftreten.\n"
-"\n"
 "-q\tWenige Meldungen ausgeben.\n"
 "\n"
+"-f\tAnwenden erzwingen, selbst wenn dabei Fehler auftreten. Wenn -q nicht\n"
+"\tangegeben wird der Patch interaktiv angewandt, und das Patch-Utility\n"
+"\tkann fragen stellen.\n"
+"\n"
 "-v\tViele Meldungen ausgeben.\n"
 "\n"
 "--leave-rejects\n"
 "\tReject-Dateien (von \\`patch') bestehen lassen, selbst wenn ein Patch\n"
 "\tnicht sauber angewandt werden kann.\n"
 "\n"
-"--interactive\n"
-"\tErlaubt GNU patch, interaktiv Fragen zu stellen. Wenn diese Option\n"
-"\tnicht angegeben wird, wird die Option -f an GNU patch übergeben.\n"
-"\n"
 "--color[=always|auto|never]\n"
 "\tSyntax-Einfärbung aktivieren (immer, automatisch, nie).\n"
 
-#: quilt/push.in:64
+#: quilt/push.in:60
 msgid "Interrupted by user; patch %s was not applied.\\n"
 msgstr "Unterbrechung durch Benutzer; Patch %s wurde nicht angewandt.\\n"
 
-#: quilt/push.in:177
+#: quilt/push.in:173
 msgid "Applying patch %s\\n"
 msgstr "Wende Patch %s an\\n"
 
-#: quilt/push.in:211
+#: quilt/push.in:207
 msgid "Patch %s does not exist; applied empty patch\\n"
 msgstr "Patch %s existiert nicht; wende leeren patch an\\n"
 
-#: quilt/push.in:215
+#: quilt/push.in:211
 msgid "Patch %s appears to be empty; applied\\n"
 msgstr "Patch %s scheint leer zu sein; angewandt\\n"
 
-#: quilt/push.in:219
+#: quilt/push.in:215
 msgid "Applied patch %s (forced; needs refresh)\\n"
 msgstr "Patch %s angewandt (erzwungen, muss aktualisiert werden (Refresh))\\n"
 
-#: quilt/push.in:229
+#: quilt/push.in:225
 msgid "Patch %s can be reverse-applied\\n"
 msgstr "Patch %s kann verkehrt angewandt werden\\n"
 
-#: quilt/push.in:232
+#: quilt/push.in:228
 msgid "Patch %s does not apply (enforce with -f)\\n"
 msgstr "Patch %s lässt sich nicht anwenden (erzwingen mit -f)\\n"
 
-#: quilt/push.in:353
+#: quilt/push.in:349
 msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr "Der oberste Patch %s muss zuerst aktualisiert werden (Refresh).\\n"
 
diff --git a/po/fr.po b/po/fr.po
index 1089eb8..a360460 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -395,6 +395,7 @@ msgid "Usage: quilt fold [-p strip-level]\\n"
 msgstr "Usage : quilt fold [-p strip-level]\\n"
 
 #: quilt/fold.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Integrate the patch read from standard input into the topmost patch:\n"
@@ -402,6 +403,11 @@ msgid ""
 "patch, the patch is applied with the specified strip level (which\n"
 "defaults to 1).\n"
 "\n"
+"-q\tQuiet operation.\n"
+"\n"
+"-f\tForce apply, even if the patch has rejects. Unless in quiet mode,\n"
+"\tapply the patch interactively: the patch utility may ask questions.\n"
+"\n"
 "-p strip-level\n"
 "\tThe number of pathname components to strip from file names\n"
 "\twhen applying patchfile.\n"
@@ -416,7 +422,7 @@ msgstr ""
 "\tNombre de niveaux de r�pertoires � retirer lors de l'application du \n"
 "\tpatch.\n"
 
-#: quilt/fold.in:112
+#: quilt/fold.in:123
 msgid "File %s may be corrupted\\n"
 msgstr "Le fichier %s est peut-�tre corrompu\\n"
 
@@ -971,7 +977,7 @@ msgstr "Aucun patch retir�\\n"
 msgid "No patches applied\\n"
 msgstr "Aucun patch n'est appliqu�\\n"
 
-#: quilt/pop.in:274 quilt/push.in:373
+#: quilt/pop.in:274 quilt/push.in:369
 msgid "Now at patch %s\\n"
 msgstr "Le patch %s est maintenant au sommet\\n"
 
@@ -992,14 +998,16 @@ msgstr ""
 "-n\tAffiche le nom de fichier au lieu du nom de patch.\n"
 
 #: quilt/push.in:24
+#, fuzzy
 msgid ""
-"Usage: quilt push [-afqv] [--leave-rejects] [--interactive] [--color[=always|"
-"auto|never]] [num|patch]\\n"
+"Usage: quilt push [-afqv] [--leave-rejects] [--color[=always|auto|never]] "
+"[num|patch]\\n"
 msgstr ""
 "Usage : quilt push [-afqv] [--leave-rejects] [--interactive] [--color"
 "[=always|auto|never]] [num|patch]\\n"
 
 #: quilt/push.in:27
+#, fuzzy
 msgid ""
 "\n"
 "Apply patch(es) from the series file.  Without options, the next patch\n"
@@ -1011,21 +1019,17 @@ msgid ""
 "\n"
 "-a\tApply all patches in the series file.\n"
 "\n"
-"-f\tForce apply, even if the patch has rejects.\n"
-"\n"
 "-q\tQuiet operation.\n"
 "\n"
+"-f\tForce apply, even if the patch has rejects. Unless in quiet mode,\n"
+"\tapply the patch interactively: the patch utility may ask questions.\n"
+"\n"
 "-v\tVerbose operation.\n"
 "\n"
 "--leave-rejects\n"
 "\tLeave around the reject files patch produced, even if the patch\n"
 "\tis not actually applied.\n"
 "\n"
-"--interactive\n"
-"\tAllow the patch utility to ask how to deal with conflicts. If\n"
-"\tthis option is not given, the -f option will be passed to the\n"
-"\tpatch program.\n"
-"\n"
 "--color[=always|auto|never]\n"
 "\tUse syntax coloring.\n"
 msgstr ""
@@ -1060,36 +1064,36 @@ msgstr ""
 "\tApplique une coloration syntaxique, toujours (�always�), de mani�re\n"
 "\tautomatique (�auto�) ou jamais (�never�).\n"
 
-#: quilt/push.in:64
+#: quilt/push.in:60
 msgid "Interrupted by user; patch %s was not applied.\\n"
 msgstr "Interrompu par l'utilisateur ; le patch %s n'a pas �t� appliqu�.\\n"
 
-#: quilt/push.in:177
+#: quilt/push.in:173
 msgid "Applying patch %s\\n"
 msgstr "Application de %s\\n"
 
-#: quilt/push.in:211
+#: quilt/push.in:207
 msgid "Patch %s does not exist; applied empty patch\\n"
 msgstr "Le patch %s n'existe pas ; patch vide appliqu�\\n"
 
-#: quilt/push.in:215
+#: quilt/push.in:211
 msgid "Patch %s appears to be empty; applied\\n"
 msgstr "Le patch %s semble vide. Il a �t� appliqu�.\\n"
 
-#: quilt/push.in:219
+#: quilt/push.in:215
 msgid "Applied patch %s (forced; needs refresh)\\n"
 msgstr "%s a �t� appliqu� (forc� ; vous devriez le rafra�chir)\\n"
 
-#: quilt/push.in:229
+#: quilt/push.in:225
 msgid "Patch %s can be reverse-applied\\n"
 msgstr "Le patch %s peut �tre appliqu� � l'envers\\n"
 
-#: quilt/push.in:232
+#: quilt/push.in:228
 msgid "Patch %s does not apply (enforce with -f)\\n"
 msgstr ""
 "Le patch %s ne s'applique pas proprement (forcez l'application avec -f)\\n"
 
-#: quilt/push.in:353
+#: quilt/push.in:349
 msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr "Le patch au sommet %s doit �tre rafraichi au pr�alable.\\n"
 
diff --git a/po/ja.po b/po/ja.po
index 683f139..08efa57 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -383,6 +383,7 @@ msgid "Usage: quilt fold [-p strip-level]\\n"
 msgstr "使い方: quilt fold [-p strip-level]\\n"
 
 #: quilt/fold.in:25
+#, fuzzy
 msgid ""
 "\n"
 "Integrate the patch read from standard input into the topmost patch:\n"
@@ -390,6 +391,11 @@ msgid ""
 "patch, the patch is applied with the specified strip level (which\n"
 "defaults to 1).\n"
 "\n"
+"-q\tQuiet operation.\n"
+"\n"
+"-f\tForce apply, even if the patch has rejects. Unless in quiet mode,\n"
+"\tapply the patch interactively: the patch utility may ask questions.\n"
+"\n"
 "-p strip-level\n"
 "\tThe number of pathname components to strip from file names\n"
 "\twhen applying patchfile.\n"
@@ -402,7 +408,7 @@ msgstr ""
 "-p strip-level\n"
 "\tパッチを適用するときに、ファイル名から省くパス名要素の数\n"
 
-#: quilt/fold.in:112
+#: quilt/fold.in:123
 msgid "File %s may be corrupted\\n"
 msgstr "ファイル %s は壊れている可能性があります\\n"
 
@@ -936,7 +942,7 @@ msgstr "適用されているパッチはありません\\n"
 msgid "No patches applied\\n"
 msgstr "適用されているパッチはありません\\n"
 
-#: quilt/pop.in:274 quilt/push.in:373
+#: quilt/pop.in:274 quilt/push.in:369
 msgid "Now at patch %s\\n"
 msgstr "現在位置はパッチ %s です\\n"
 
@@ -955,14 +961,16 @@ msgstr ""
 "されたパッチの前のパッチ名を表示。\n"
 
 #: quilt/push.in:24
+#, fuzzy
 msgid ""
-"Usage: quilt push [-afqv] [--leave-rejects] [--interactive] [--color[=always|"
-"auto|never]] [num|patch]\\n"
+"Usage: quilt push [-afqv] [--leave-rejects] [--color[=always|auto|never]] "
+"[num|patch]\\n"
 msgstr ""
 "使い方: quilt push [-afqv] [--leave-rejects] [--interactive] [--color"
 "[=always|auto|never]] [数字|パッチ]\\n"
 
 #: quilt/push.in:27
+#, fuzzy
 msgid ""
 "\n"
 "Apply patch(es) from the series file.  Without options, the next patch\n"
@@ -974,21 +982,17 @@ msgid ""
 "\n"
 "-a\tApply all patches in the series file.\n"
 "\n"
-"-f\tForce apply, even if the patch has rejects.\n"
-"\n"
 "-q\tQuiet operation.\n"
 "\n"
+"-f\tForce apply, even if the patch has rejects. Unless in quiet mode,\n"
+"\tapply the patch interactively: the patch utility may ask questions.\n"
+"\n"
 "-v\tVerbose operation.\n"
 "\n"
 "--leave-rejects\n"
 "\tLeave around the reject files patch produced, even if the patch\n"
 "\tis not actually applied.\n"
 "\n"
-"--interactive\n"
-"\tAllow the patch utility to ask how to deal with conflicts. If\n"
-"\tthis option is not given, the -f option will be passed to the\n"
-"\tpatch program.\n"
-"\n"
 "--color[=always|auto|never]\n"
 "\tUse syntax coloring.\n"
 msgstr ""
@@ -1020,36 +1024,36 @@ msgstr ""
 "        シンタックスの色付けを行なう。\n"
 "\n"
 
-#: quilt/push.in:64
+#: quilt/push.in:60
 msgid "Interrupted by user; patch %s was not applied.\\n"
 msgstr "ユーザによって中断されました。パッチ %s は適用されていません。\\n"
 
-#: quilt/push.in:177
+#: quilt/push.in:173
 msgid "Applying patch %s\\n"
 msgstr "パッチ %s を適用しています\\n"
 
-#: quilt/push.in:211
+#: quilt/push.in:207
 msgid "Patch %s does not exist; applied empty patch\\n"
 msgstr "パッチ %s は存在しません。空のパッチを適用しました\\n"
 
-#: quilt/push.in:215
+#: quilt/push.in:211
 msgid "Patch %s appears to be empty; applied\\n"
 msgstr "パッチ %s は空のようですが、適用しました\\n"
 
-#: quilt/push.in:219
+#: quilt/push.in:215
 msgid "Applied patch %s (forced; needs refresh)\\n"
 msgstr ""
 "パッチ %s を適用しました (強制適用したために、リフレッシュが必要です)\\n"
 
-#: quilt/push.in:229
+#: quilt/push.in:225
 msgid "Patch %s can be reverse-applied\\n"
 msgstr "パッチ %s は、反転して適用することができます\\n"
 
-#: quilt/push.in:232
+#: quilt/push.in:228
 msgid "Patch %s does not apply (enforce with -f)\\n"
 msgstr "パッチ %s が適用できません (強制適用する場合は -fを付けてください)\\n"
 
-#: quilt/push.in:353
+#: quilt/push.in:349
 msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr "最上位パッチのリフレッシュが最初に必要です。\\n"
 
diff --git a/po/quilt.pot b/po/quilt.pot
index 9d6457b..8199d6f 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -267,12 +267,17 @@ msgid ""
 "patch, the patch is applied with the specified strip level (which\n"
 "defaults to 1).\n"
 "\n"
+"-q\tQuiet operation.\n"
+"\n"
+"-f\tForce apply, even if the patch has rejects. Unless in quiet mode,\n"
+"\tapply the patch interactively: the patch utility may ask questions.\n"
+"\n"
 "-p strip-level\n"
 "\tThe number of pathname components to strip from file names\n"
 "\twhen applying patchfile.\n"
 msgstr ""
 
-#: quilt/fold.in:112
+#: quilt/fold.in:123
 msgid "File %s may be corrupted\\n"
 msgstr ""
 
@@ -647,7 +652,7 @@ msgstr ""
 msgid "No patches applied\\n"
 msgstr ""
 
-#: quilt/pop.in:274 quilt/push.in:373
+#: quilt/pop.in:274 quilt/push.in:369
 msgid "Now at patch %s\\n"
 msgstr ""
 
@@ -664,8 +669,8 @@ msgstr ""
 
 #: quilt/push.in:24
 msgid ""
-"Usage: quilt push [-afqv] [--leave-rejects] [--interactive] [--color[=always|"
-"auto|never]] [num|patch]\\n"
+"Usage: quilt push [-afqv] [--leave-rejects] [--color[=always|auto|never]] "
+"[num|patch]\\n"
 msgstr ""
 
 #: quilt/push.in:27
@@ -680,54 +685,50 @@ msgid ""
 "\n"
 "-a\tApply all patches in the series file.\n"
 "\n"
-"-f\tForce apply, even if the patch has rejects.\n"
-"\n"
 "-q\tQuiet operation.\n"
 "\n"
+"-f\tForce apply, even if the patch has rejects. Unless in quiet mode,\n"
+"\tapply the patch interactively: the patch utility may ask questions.\n"
+"\n"
 "-v\tVerbose operation.\n"
 "\n"
 "--leave-rejects\n"
 "\tLeave around the reject files patch produced, even if the patch\n"
 "\tis not actually applied.\n"
 "\n"
-"--interactive\n"
-"\tAllow the patch utility to ask how to deal with conflicts. If\n"
-"\tthis option is not given, the -f option will be passed to the\n"
-"\tpatch program.\n"
-"\n"
 "--color[=always|auto|never]\n"
 "\tUse syntax coloring.\n"
 msgstr ""
 
-#: quilt/push.in:64
+#: quilt/push.in:60
 msgid "Interrupted by user; patch %s was not applied.\\n"
 msgstr ""
 
-#: quilt/push.in:177
+#: quilt/push.in:173
 msgid "Applying patch %s\\n"
 msgstr ""
 
-#: quilt/push.in:211
+#: quilt/push.in:207
 msgid "Patch %s does not exist; applied empty patch\\n"
 msgstr ""
 
-#: quilt/push.in:215
+#: quilt/push.in:211
 msgid "Patch %s appears to be empty; applied\\n"
 msgstr ""
 
-#: quilt/push.in:219
+#: quilt/push.in:215
 msgid "Applied patch %s (forced; needs refresh)\\n"
 msgstr ""
 
-#: quilt/push.in:229
+#: quilt/push.in:225
 msgid "Patch %s can be reverse-applied\\n"
 msgstr ""
 
-#: quilt/push.in:232
+#: quilt/push.in:228
 msgid "Patch %s does not apply (enforce with -f)\\n"
 msgstr ""
 
-#: quilt/push.in:353
+#: quilt/push.in:349
 msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr ""
 
diff --git a/quilt.changes b/quilt.changes
index 6f8b93c..594fde7 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Sat Apr 28 00:51:22 CEST 2007 - agruen@suse.de
+
+- Try to clean up the force-apply and interactive-apply logic
+  in quilt push, and add a force option to quilt fold: Fold was
+  applying patches interactively and was restoring files if there
+  were rejects; this was very unexpected for users.
+
+-------------------------------------------------------------------
 Fri Apr 27 13:52:00 CEST 2007 - agruen@suse.de
 
 - Rename the ``remove'' command to ``revert'': this removes
diff --git a/quilt/fold.in b/quilt/fold.in
index 248cfeb..f2b967a 100644
--- a/quilt/fold.in
+++ b/quilt/fold.in
@@ -28,6 +28,11 @@ After making sure that all files modified are part of the topmost
 patch, the patch is applied with the specified strip level (which
 defaults to 1).
 
+-q	Quiet operation.
+
+-f	Force apply, even if the patch has rejects. Unless in quiet mode,
+	apply the patch interactively: the patch utility may ask questions.
+
 -p strip-level
 	The number of pathname components to strip from file names
 	when applying patchfile.
@@ -39,7 +44,7 @@ defaults to 1).
 	fi
 }
 
-options=`getopt -o p:qh -- "$@"`
+options=`getopt -o p:qfh -- "$@"`
 
 if [ $? -ne 0 ]
 then
@@ -51,11 +56,14 @@ eval set -- "$options"
 while true
 do
 	case "$1" in
+	-f)
+		opt_force=1
+		shift ;;
 	-p)
 		opt_strip_level=$2
 		shift 2 ;;
 	-q)
-		opt_silent=1
+		opt_quiet=1
 		shift ;;
 	-h)
 		usage -h ;;
@@ -71,7 +79,8 @@ then
 fi
 
 : ${opt_strip_level:=1}
-[ -n "$opt_silent" ] && silent=-s
+[ -n "$opt_quiet" ] && silent=-s
+[ -z "$opt_force" -o -n "$opt_quiet" ] && force_apply=-f
 
 top=$(find_top_patch) || exit 1
 
@@ -79,9 +88,11 @@ trap "failed=1" SIGINT
 
 workdir=$(gen_tempfile -d $PWD)
 patch -d ${SUBDIR:-.} $QUILT_PATCH_OPTS -p$opt_strip_level $silent \
-      --backup --prefix="$workdir/$SUBDIR" -E \
+      --backup --prefix="$workdir/$SUBDIR" -E $force_apply \
 || failed=1
 
+[ -n "$opt_force" ] && failed=
+
 if [ -z "$failed" ]
 then
 	# Copy additional files from workdir to the backup directory
diff --git a/quilt/push.in b/quilt/push.in
index 73a0856..1ac1c3a 100644
--- a/quilt/push.in
+++ b/quilt/push.in
@@ -21,7 +21,7 @@ setup_colors
 
 usage()
 {
-	printf $"Usage: quilt push [-afqv] [--leave-rejects] [--interactive] [--color[=always|auto|never]] [num|patch]\n"
+	printf $"Usage: quilt push [-afqv] [--leave-rejects] [--color[=always|auto|never]] [num|patch]\n"
 	if [ x$1 = x-h ]
 	then
 		printf $"
@@ -34,21 +34,17 @@ be used.
 
 -a	Apply all patches in the series file.
 
--f	Force apply, even if the patch has rejects.
-
 -q	Quiet operation.
 
+-f	Force apply, even if the patch has rejects. Unless in quiet mode,
+	apply the patch interactively: the patch utility may ask questions.
+
 -v	Verbose operation.
 
 --leave-rejects
 	Leave around the reject files patch produced, even if the patch
 	is not actually applied.
 
---interactive
-	Allow the patch utility to ask how to deal with conflicts. If
-	this option is not given, the -f option will be passed to the
-	patch program.
-
 --color[=always|auto|never]
 	Use syntax coloring.
 "
@@ -344,7 +340,7 @@ stop_at_patch=$(find_unapplied_patch "$stop_at_patch") || exit 1
 
 [ -n "$opt_quiet" ] && silent=-s
 [ -z "$opt_verbose" ] && silent_unless_verbose=-s
-[ -z "$opt_interactive" ] && force_apply=-f
+[ -z "$opt_force" -o -n "$opt_quiet" ] && force_apply=-f
 [ -n "$opt_force" ] && opt_leave_rejects=1
 
 top=$(top_patch)