forked from pool/patch
e15ff121e8
Copy from devel:tools/patch based on submit request 21490 from user agruen OBS-URL: https://build.opensuse.org/request/show/21490 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/patch?expand=0&rev=13
25 lines
848 B
Diff
25 lines
848 B
Diff
Index: patch-2.5.9-122-gba37782/src/patch.c
|
|
===================================================================
|
|
--- patch-2.5.9-122-gba37782.orig/src/patch.c
|
|
+++ patch-2.5.9-122-gba37782/src/patch.c
|
|
@@ -572,6 +572,7 @@ static struct option const longopts[] =
|
|
{"posix", no_argument, NULL, CHAR_MAX + 7},
|
|
{"quoting-style", required_argument, NULL, CHAR_MAX + 8},
|
|
{"reject-format", required_argument, NULL, CHAR_MAX + 9},
|
|
+ {"unified-reject-files", no_argument, NULL, CHAR_MAX + 1001},
|
|
{NULL, no_argument, NULL, 0}
|
|
};
|
|
|
|
@@ -841,6 +842,11 @@ get_some_switches (void)
|
|
else
|
|
usage (stderr, 2);
|
|
break;
|
|
+ case CHAR_MAX + 1001:
|
|
+ say ("warning: the `--unified-reject-files' option is obsolete; use "
|
|
+ "`--reject-format=unified' instead\n");
|
|
+ reject_format = UNI_DIFF;
|
|
+ break;
|
|
default:
|
|
usage (stderr, 2);
|
|
}
|