Ondřej Pohořelský
parent
2a4367e6d7
commit
11fa102767
@ -1,86 +0,0 @@
|
||||
From 0fdc014acc342dace179ba698e58fcb138fb86de Mon Sep 17 00:00:00 2001
|
||||
From: Todd Zullinger <tmz@pobox.com>
|
||||
Date: Tue, 14 Nov 2023 11:38:19 -0500
|
||||
Subject: [PATCH] send-email: avoid duplicate specification warnings
|
||||
|
||||
With perl-Getopt-Long >= 2.55, a warning is issued for options which are
|
||||
specified more than once. In addition to causing users to see warnings,
|
||||
this results in test failures which compare the output. An example,
|
||||
from t9001-send-email.37:
|
||||
|
||||
| +++ diff -u expect actual
|
||||
| --- expect 2023-11-14 10:38:23.854346488 +0000
|
||||
| +++ actual 2023-11-14 10:38:23.848346466 +0000
|
||||
| @@ -1,2 +1,7 @@
|
||||
| +Duplicate specification "no-chain-reply-to" for option "no-chain-reply-to"
|
||||
| +Duplicate specification "to-cover|to-cover!" for option "to-cover"
|
||||
| +Duplicate specification "cc-cover|cc-cover!" for option "cc-cover"
|
||||
| +Duplicate specification "no-thread" for option "no-thread"
|
||||
| +Duplicate specification "no-to-cover" for option "no-to-cover"
|
||||
| fatal: longline.patch:35 is longer than 998 characters
|
||||
| warning: no patches were sent
|
||||
| error: last command exited with $?=1
|
||||
| not ok 37 - reject long lines
|
||||
|
||||
Remove the duplicate option specs.
|
||||
|
||||
Signed-off-by: Todd Zullinger <tmz@pobox.com>
|
||||
---
|
||||
git-send-email.perl | 16 +++-------------
|
||||
1 file changed, 3 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/git-send-email.perl b/git-send-email.perl
|
||||
index affbb88509..3c678c8998 100755
|
||||
--- a/git-send-email.perl
|
||||
+++ b/git-send-email.perl
|
||||
@@ -503,7 +503,6 @@ sub config_regexp {
|
||||
"bcc=s" => \@getopt_bcc,
|
||||
"no-bcc" => \$no_bcc,
|
||||
"chain-reply-to!" => \$chain_reply_to,
|
||||
- "no-chain-reply-to" => sub {$chain_reply_to = 0},
|
||||
"sendmail-cmd=s" => \$sendmail_cmd,
|
||||
"smtp-server=s" => \$smtp_server,
|
||||
"smtp-server-option=s" => \@smtp_server_options,
|
||||
@@ -518,36 +517,27 @@ sub config_regexp {
|
||||
"smtp-auth=s" => \$smtp_auth,
|
||||
"no-smtp-auth" => sub {$smtp_auth = 'none'},
|
||||
"annotate!" => \$annotate,
|
||||
- "no-annotate" => sub {$annotate = 0},
|
||||
"compose" => \$compose,
|
||||
"quiet" => \$quiet,
|
||||
"cc-cmd=s" => \$cc_cmd,
|
||||
"header-cmd=s" => \$header_cmd,
|
||||
"no-header-cmd" => \$no_header_cmd,
|
||||
"suppress-from!" => \$suppress_from,
|
||||
- "no-suppress-from" => sub {$suppress_from = 0},
|
||||
"suppress-cc=s" => \@suppress_cc,
|
||||
- "signed-off-cc|signed-off-by-cc!" => \$signed_off_by_cc,
|
||||
- "no-signed-off-cc|no-signed-off-by-cc" => sub {$signed_off_by_cc = 0},
|
||||
- "cc-cover|cc-cover!" => \$cover_cc,
|
||||
- "no-cc-cover" => sub {$cover_cc = 0},
|
||||
- "to-cover|to-cover!" => \$cover_to,
|
||||
- "no-to-cover" => sub {$cover_to = 0},
|
||||
+ "signed-off-by-cc!" => \$signed_off_by_cc,
|
||||
+ "cc-cover!" => \$cover_cc,
|
||||
+ "to-cover!" => \$cover_to,
|
||||
"confirm=s" => \$confirm,
|
||||
"dry-run" => \$dry_run,
|
||||
"envelope-sender=s" => \$envelope_sender,
|
||||
"thread!" => \$thread,
|
||||
- "no-thread" => sub {$thread = 0},
|
||||
"validate!" => \$validate,
|
||||
- "no-validate" => sub {$validate = 0},
|
||||
"transfer-encoding=s" => \$target_xfer_encoding,
|
||||
"format-patch!" => \$format_patch,
|
||||
- "no-format-patch" => sub {$format_patch = 0},
|
||||
"8bit-encoding=s" => \$auto_8bit_encoding,
|
||||
"compose-encoding=s" => \$compose_encoding,
|
||||
"force" => \$force,
|
||||
"xmailer!" => \$use_xmailer,
|
||||
- "no-xmailer" => sub {$use_xmailer = 0},
|
||||
"batch-size=i" => \$batch_size,
|
||||
"relogin-delay=i" => \$relogin_delay,
|
||||
"git-completion-helper" => \$git_completion_helper,
|
||||
--
|
||||
2.42.0
|
||||
|
||||
19
git.spec
19
git.spec
@ -77,8 +77,8 @@
|
||||
%global _package_note_file %{_builddir}/%{name}-%{real_version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld
|
||||
|
||||
Name: git
|
||||
Version: 2.43.0
|
||||
Release: 3%{?dist}
|
||||
Version: 2.43.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Fast Version Control System
|
||||
License: BSD-3-Clause AND GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT
|
||||
URL: https://git-scm.com/
|
||||
@ -127,9 +127,6 @@ Patch2: 0002-t-lib-git-daemon-try-harder-to-find-a-port.patch
|
||||
# https://github.com/tmzullinger/git/commit/aa5105dc11
|
||||
Patch3: 0003-t-lib-git-svn-try-harder-to-find-a-port.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2247532#c8
|
||||
Patch4: 0001-send-email-avoid-duplicate-specification-warnings.patch
|
||||
|
||||
# Configurates Apache test server to use `DavLockDBType sdbm`
|
||||
# Prevents t5540 failures on i686, s390x and ppc64le
|
||||
Patch5: git-test-apache-davlockdbtype-config.patch
|
||||
@ -827,13 +824,7 @@ find %{buildroot}%{_pkgdocdir} -name "*.html" -print0 | xargs -r0 linkchecker
|
||||
# t5559-http-fetch-smart-http2 runs t5551-http-fetch-smart with
|
||||
# HTTP_PROTO=HTTP/2. Unfortunately, it fails quite regularly.
|
||||
# https://lore.kernel.org/git/Y4fUntdlc1mqwad5@pobox.com/
|
||||
#
|
||||
# t6300.35 t6300.107 t6300.108 are skipped due to them failing
|
||||
# with zlib-ng
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2253368
|
||||
# These tests will be enabled again in next git release, where
|
||||
# fix should be in place.
|
||||
GIT_SKIP_TESTS="t5559 t6300.35 t6300.107 t6300.108"
|
||||
GIT_SKIP_TESTS="t5559"
|
||||
|
||||
%if 0%{?rhel} && 0%{?rhel} < 8
|
||||
# Skip tests which require mod_http2 on el7
|
||||
@ -1054,6 +1045,10 @@ rmdir --ignore-fail-on-non-empty "$testdir"
|
||||
%{?with_docs:%{_pkgdocdir}/git-svn.html}
|
||||
|
||||
%changelog
|
||||
* Mon Feb 12 2024 Ondřej Pohořelský <opohorel@redhat.com> - 2.43.1-1
|
||||
- update to 2.43.1
|
||||
- resolves: #2263575
|
||||
|
||||
* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.43.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||
|
||||
|
||||
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (git-2.43.0.tar.xz) = d0c1694ae23ff7d523e617b98d7c9a9753a2ee58f92c21b67a192d1c57398a62ff9c1a34558ae31af8dc8d95122c219f39f654e99a3b4e7cfc3dd07be9e13203
|
||||
SHA512 (git-2.43.0.tar.sign) = 4ff055db9b7100c40427a570f8fb6ec4b5ea943d197597ca8061924afbc6eb46d28aaf46c31679addb8adaf4f672e7efb96e088b789d172b5270420a7e5fde67
|
||||
SHA512 (git-2.43.1.tar.xz) = c8cb27645f09b831a6206bafa91c955d735b4257a98b1adaaaa5692a0a3aaa0417878095f88eca59d4fe0ffa058865508b5099db097e7b4b06253a16f57c3b3e
|
||||
SHA512 (git-2.43.1.tar.sign) = 0f84b136111bc6f6b99ad325fd9def9554ed1ec032b765c32c7299e91702cf44251b31a2e5453ab1379b8c342f640736597459bfaddaf8c0064004ee32535820
|
||||
|
||||
Loading…
Reference in New Issue
Block a user