From 7d88583a8d856b7449a47cb6c56189bc570d0a9f1df8501221afa993fc519343 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 10 Oct 2022 16:43:42 +0000 Subject: [PATCH] Accepting request 1008719 from devel:tools:scm OBS-URL: https://build.opensuse.org/request/show/1008719 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=289 --- git-2.37.3.tar.sign | Bin 566 -> 0 bytes git-2.37.3.tar.xz | 3 --- git-2.38.0.tar.sign | Bin 0 -> 566 bytes git-2.38.0.tar.xz | 3 +++ git.changes | 20 ++++++++++++++++++++ git.spec | 14 +++++++------- 6 files changed, 30 insertions(+), 10 deletions(-) delete mode 100644 git-2.37.3.tar.sign delete mode 100644 git-2.37.3.tar.xz create mode 100644 git-2.38.0.tar.sign create mode 100644 git-2.38.0.tar.xz diff --git a/git-2.37.3.tar.sign b/git-2.37.3.tar.sign deleted file mode 100644 index bf1c1c947901e6b8de149b0b549ddfe8962e7d4446c1374ab027559d6a2e1e99..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+c+?}HpZY8^O!tC}R$KGky< zeYS{k#B45T)~rJS{TcBZ&wa7wmw_4?#{(IWJ|+KukqKfMqozZw^#@bUnAQ#|pJ4d+ z-K35pHTxc$r8IZVwtd+qV2kCPbUtp&fhN zXOu+kV17&xEoIzCZ(@w^^t!{$?jo5**`II5EHRHE`lA9|4)d|i2Ic3HNeT>@NSD&v zZOoh&?W@q;GaAj~aN-?}TpR_iRiexWOTV&N#k)faZ?!yP4;JYc`%t&;<&?e{hVc+1 zL@SIR@O&2fc7@Gbl9Eklv;OcWlmks+qe+3@5{RU-|0`^Zit5YEzrOLAeeF|Aa5DCw zt1=M_BEfGH;*{?IaKg;ZH%2MO&1NR~2?pv-j9RkYV;y$<*=@#4-ZtIoz2IcB%P{H@ E7zY>@KmY&$ diff --git a/git-2.37.3.tar.xz b/git-2.37.3.tar.xz deleted file mode 100644 index 02a4c17..0000000 --- a/git-2.37.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:814641d7f61659cfbc17825d0462499ca1403e39ff53d76a8512050e6483e87a -size 6987464 diff --git a/git-2.38.0.tar.sign b/git-2.38.0.tar.sign new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..7893197140ba761f32a40fd6db53b83c6994f71f7f64fa22371fd605bbfc2cbf GIT binary patch literal 566 zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+cxlpJD1iN^`f?)s_bh9=*%7&T-|%^?o1Nrn<^YHao|t>e4>;B4I$0Sr z+N>JI2QJ#4?{ej@7YRhH-sVt*Sx(02!2>yV^ssqA=O$+yS{EY@Z%uRw7Fi%aZ52u= zu8hz%d)P%>Mz-|?cx!P}eDR7EEWU53eQ9BVEnMFohyS$-mKs);@*S^+mvlp0X@MTD zm~_?Cb|-QRI+fL6vvFY_Eb4V=x1%sO@7c>bE9E<|VOSPLSY>(%IT<3LJ_Vf!=BZEM z#*ik=kc>k3`o$}xkTJRVjqXX9?FFJb^hVg}OmNT05*?^CnniH&wX}|g!smtVqLoeU zXp8%$&k@t3I%b2hnjoy& + +- git 2.38.0: + * scalar: a repository management tool for large repositories + * new git rebase --update-refs (global rebase.updateRefs) + to update dependent branches + * merge-tree integrated with the new ort merge strategy + --write-tree, while --trivial-merge retains the old mode + * bare git repositories can now be stored and distributed + in other git repositories + * Setting the safe.bareRepository configuration to "explicit" + avoids running arbitrary commands from filesystem monitoring + hooks of untrusted git repositories unless --git-dir is set + * git grep: new -m / --max-count options to limit the number + of matches per file + * git ls-files --format is a new option to customize outout + * git cat-file and git show now support mailmap author mapping + * bug fixes and performance improvements + ------------------------------------------------------------------- Thu Sep 22 13:49:57 UTC 2022 - Dirk Müller diff --git a/git.spec b/git.spec index 5fef41c..a8fcc37 100644 --- a/git.spec +++ b/git.spec @@ -36,7 +36,7 @@ %bcond_with asciidoctor %endif Name: git -Version: 2.37.3 +Version: 2.38.0 Release: 0 Summary: Fast, scalable, distributed revision control system License: GPL-2.0-only @@ -78,10 +78,10 @@ BuildRequires: zlib-devel Requires: git-core = %{version} Requires: perl-Git = %{version} Recommends: git-email -Suggests: git-gui -Suggests: gitk Suggests: git-daemon +Suggests: git-gui Suggests: git-web +Suggests: gitk %if 0%{?suse_version} >= 1500 BuildRequires: openssh-clients BuildRequires: sysuser-tools @@ -264,7 +264,7 @@ Group: Development/Tools/Version Control Requires: git-core = %{version} Requires: tk >= 8.4 %if 0%{?suse_version} == 1315 -Supplements: packageand(git-core:tk) +Supplements: (git-core and tk) %else Supplements: (git-core and tk) %endif @@ -283,7 +283,7 @@ Group: Development/Tools/Version Control Requires: git-core = %{version} Requires: tk >= 8.4 %if 0%{?suse_version} == 1315 -Supplements: packageand(git-core:tk) +Supplements: (git-core and tk) %else Supplements: (git-core and tk) %endif @@ -305,7 +305,7 @@ Requires: git-core = %{version} Requires: perl-CGI Requires: perl-Git = %{version} %if 0%{?suse_version} == 1315 -Supplements: packageand(git-core:apache2) +Supplements: (git-core and apache2) %else Supplements: (git-core and apache2) %endif @@ -321,7 +321,7 @@ directory /git/ that calls the cgi script. %build # update shebang to use python3 -sed -e '1{s,.*,#!/usr/bin/python3,}' git-p4.py +sed -e '1{s,.*,#!%{_bindir}/python3,}' git-p4.py cat > .make <<'EOF' #!/bin/bash %make_build CFLAGS="%{optflags}" \