summaryrefslogtreecommitdiff
path: root/sys-devel/patch/files/patch-2.7.6_p20250206-no-backup-if-mismatch-regression.patch
diff options
context:
space:
mode:
Diffstat (limited to 'sys-devel/patch/files/patch-2.7.6_p20250206-no-backup-if-mismatch-regression.patch')
-rw-r--r--sys-devel/patch/files/patch-2.7.6_p20250206-no-backup-if-mismatch-regression.patch51
1 files changed, 0 insertions, 51 deletions
diff --git a/sys-devel/patch/files/patch-2.7.6_p20250206-no-backup-if-mismatch-regression.patch b/sys-devel/patch/files/patch-2.7.6_p20250206-no-backup-if-mismatch-regression.patch
deleted file mode 100644
index 0891b855d998..000000000000
--- a/sys-devel/patch/files/patch-2.7.6_p20250206-no-backup-if-mismatch-regression.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From b5d2124e2e6019ee5d329b49ef6904a0daec74a1 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Mon, 24 Feb 2025 22:59:51 -0800
-Subject: [PATCH] patch: fix --no-backup-if-mismatch regression
-
-Problem reported by Sam James in:
-https://lists.gnu.org/archive/html/bug-patch/2025-02/msg00014.html
-https://bugs.gentoo.org/show_bug.cgi?id=949834
-* src/patch.c (backup_if_mismatch_specified): New static var.
-(get_some_switches): Set it.
-(main): Default backup_if_mismatch only if not set on command line.
-* tests/no-backup: New file.
-* tests/Makefile.am (TESTS): Add it.
----
- src/patch.c | 6 ++++-
- 3 files changed, 62 insertions(+), 1 deletion(-)
-
-diff --git a/src/patch.c b/src/patch.c
-index 6c460f7..e4d0524 100644
---- a/src/patch.c
-+++ b/src/patch.c
-@@ -118,6 +118,7 @@ static bool merge;
- static enum diff reject_format = NO_DIFF; /* automatic */
- static bool make_backups;
- static bool backup_if_mismatch;
-+static bool backup_if_mismatch_specified;
- static char const *version_control;
- static char const *version_control_context;
- static bool remove_empty_files;
-@@ -196,7 +197,8 @@ main (int argc, char **argv)
- if (set_utc && setenv ("TZ", "UTC0", 1) < 0)
- pfatal ("setenv");
-
-- backup_if_mismatch = ! posixly_correct;
-+ if (!backup_if_mismatch_specified)
-+ backup_if_mismatch = !posixly_correct;
- if (make_backups | backup_if_mismatch)
- backup_type = get_version (version_control_context, version_control);
-
-@@ -1050,9 +1052,11 @@ get_some_switches (int argc, char **argv)
- usage (stdout, EXIT_SUCCESS);
- case CHAR_MAX + 5:
- backup_if_mismatch = true;
-+ backup_if_mismatch_specified = true;
- break;
- case CHAR_MAX + 6:
- backup_if_mismatch = false;
-+ backup_if_mismatch_specified = true;
- break;
- case CHAR_MAX + 7:
- posixly_correct = true;