SHA256
1
0
forked from pool/git

Accepting request 987497 from devel:tools:scm

OBS-URL: https://build.opensuse.org/request/show/987497
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=281
This commit is contained in:
Dominique Leuenberger 2022-07-09 14:58:55 +00:00 committed by Git OBS Bridge
parent d036f1fd64
commit 17fafd160b
7 changed files with 13 additions and 26 deletions

Binary file not shown.

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:405d4a0ff6e818d1f12b3e92e1ac060f612adcb454f6299f70583058cb508370
size 7004044

BIN
git-2.37.0.tar.sign Normal file

Binary file not shown.

3
git-2.37.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9f7fa1711bd00c4ec3dde2fe44407dc13f12e4772b5e3c72a58db4c07495411f
size 6978796

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Jul 7 07:50:07 UTC 2022 - Danilo Spinella <danilo.spinella@suse.com>
- Update git to 2.37.0:
https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.37.0.txt
- git add --interactive is now default upstream, remove suse patch:
* suse-use-builtin-add-interactive.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jun 15 19:39:55 UTC 2022 - Antoine Belvire <antoine.belvire@opensuse.org> Wed Jun 15 19:39:55 UTC 2022 - Antoine Belvire <antoine.belvire@opensuse.org>

View File

@ -36,7 +36,7 @@
%bcond_with asciidoctor %bcond_with asciidoctor
%endif %endif
Name: git Name: git
Version: 2.36.1 Version: 2.37.0
Release: 0 Release: 0
Summary: Fast, scalable, distributed revision control system Summary: Fast, scalable, distributed revision control system
License: GPL-2.0-only License: GPL-2.0-only
@ -53,8 +53,6 @@ Source8: %{name}.keyring
Source9: %{name}-gui.desktop Source9: %{name}-gui.desktop
Source10: %{name}-gui.png Source10: %{name}-gui.png
Source11: git-daemon.conf Source11: git-daemon.conf
# PATCH-FIX-SUSE: Default to builtin add -i mode to avoid perl dependency
Patch2: suse-use-builtin-add-interactive.patch
Patch3: completion-wordbreaks.diff Patch3: completion-wordbreaks.diff
# CVE-2011-2186, bnc#698456 # CVE-2011-2186, bnc#698456
Patch4: git-prevent_xss-default.diff Patch4: git-prevent_xss-default.diff
@ -320,8 +318,7 @@ The apache2 configuration contained in this package installs a virtual
directory /git/ that calls the cgi script. directory /git/ that calls the cgi script.
%prep %prep
%setup -q %autosetup -p1
%autopatch -p1
%build %build
cat > .make <<'EOF' cat > .make <<'EOF'

View File

@ -1,18 +0,0 @@
--- git-2.31.1/builtin/add.c 2021-03-26 23:03:34.000000000 +0100
+++ git-2.31.1/builtin/add.c 2021-04-08 13:15:09.004425194 +0200
@@ -208,9 +208,14 @@
else if (!git_config_get_bool("feature.experimental", &experimental) &&
experimental)
use_builtin_add_i = 1;
+ else
+ use_builtin_add_i = 1;
}
- if (use_builtin_add_i == 1) {
+ /* SUSE oddity - git-add--interactive is the single remaining perl dependency of
+ * git-core - so we opt to default to the builtin interactive shell and strip it.
+ * Please let us know at https://bugzilla.suse.com/ if there is an issue with this.*/
+ if (use_builtin_add_i != 0) {
enum add_p_mode mode;
if (!patch_mode)