From 26c472cc4e13d696f3c06d4920354ebd2c28f939c7a2dc20ef4ca142e74909af Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 21 May 2018 18:21:32 +0000 Subject: [PATCH] Accepting request 610717 from devel:tools:scm OBS-URL: https://build.opensuse.org/request/show/610717 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=218 --- git-2.16.3.tar.sign | Bin 566 -> 0 bytes git-2.16.3.tar.xz | 3 --- git-2.17.0.tar.sign | Bin 0 -> 566 bytes git-2.17.0.tar.xz | 3 +++ git.changes | 53 ++++++++++++++++++++++++++++++++++++++++++++ git.spec | 15 +++++-------- 6 files changed, 62 insertions(+), 12 deletions(-) delete mode 100644 git-2.16.3.tar.sign delete mode 100644 git-2.16.3.tar.xz create mode 100644 git-2.17.0.tar.sign create mode 100644 git-2.17.0.tar.xz diff --git a/git-2.16.3.tar.sign b/git-2.16.3.tar.sign deleted file mode 100644 index b1145f6f9f059e6fa3eb9259e316260165299a5bc148d172e0692b1e244cdcfa..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j-T@HVmj=OQ1+cBEo#9j6$-s}ahW1$VsW;s@;=x*^1iV&aJJ2?S|t@Ou@~uuL_VFDKo@VfK1gZlei^(dRclg3XND7N>)>fQ8;z<~tZkmQlX zcKZF>;wS8E=80VO2q$3-US3bDF&^t@xD6P62xUxL6vxX}IE0E+Js=AW>3_#BE?<8* zmMh3D%MJ8F<8PadGxQZxG|NIRb{K z}^>pE9UuU?ja+`qJr4m{GKD0BrB1`Q}=!NGo}jto8V z9GN*MDp%f1^zeIP+!L7&vD2wFp#mx!DvE@8qc~snFgbi@Zh8nN5=Ph<3$I&#XsLtiigF#fCkbijYrK(>qhD?KTq_ddQly@BnhtqQ(3Vy zl}pou6_D6XgA7Fbpq&-~-kpA^>Gm>RPq8j30Z28s0ddP`X)H-UXzy>|TqZTGsPqK)R>cIhzFH); zBN?kIP0k(~Upa%ebg4J$F^{BdRIqkbGAkm&Pv~bveBp-AL8Xu(OscPSKGqwfIVaO@ zz7yU^`_>L*(s<>0DMCSj`b!v1Rd7|)YdU(VOwfO?B5yEZg?%H=Xsng``0!TRn1F-} zX3<*%hmkBea+W@@*5-~?xd=d;2f7_P?aiR8(lvZ1L8g7{>ePDAecfkyeU9in>6KC6 z`OE?j*uh}_Be7%e8r;#h{x+&vNId`trYWGpP{8X$3yvK;px@~W$5!OuThi2n05TO> zFjZh7X$Oonv53cX_kCM(9p`-6^Pvk-wnb};Iu%h;Pd@9AVyXl&-(O=Rgzd?zx+eQ! zF+f%dsG0rL)dZNj@@DFLXy&3KZxa8a*LNRMeEX|b=ub;6*6Kx_hTV~Phk}yB1jq?S EyfA1F{{R30 literal 0 HcmV?d00001 diff --git a/git-2.17.0.tar.xz b/git-2.17.0.tar.xz new file mode 100644 index 0000000..d1db3df --- /dev/null +++ b/git-2.17.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e916e5e95e81dbeafa7aac5d719c01108b5c814eb90b746695afa1afedf955c7 +size 5011556 diff --git a/git.changes b/git.changes index 8d316eb..94fb8fe 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,56 @@ +------------------------------------------------------------------- +Sat May 19 20:37:48 UTC 2018 - schwab@linux-m68k.org + +- git 2.17.0: + * "diff" family of commands learned "--find-object=" option + to limit the findings to changes that involve the named object. + * "git format-patch" learned to give 72-cols to diffstat, which is + consistent with other line length limits the subcommand uses for + its output meant for e-mails. + * The log from "git daemon" can be redirected with a new option; one + relevant use case is to send the log to standard error (instead of + syslog) when running it from inetd. + * "git rebase" learned to take "--allow-empty-message" option. + * "git am" has learned the "--quit" option, in addition to the + existing "--abort" option; having the pair mirrors a few other + commands like "rebase" and "cherry-pick". + * "git worktree add" learned to run the post-checkout hook, just like + "git clone" runs it upon the initial checkout. + * "git tag" learned an explicit "--edit" option that allows the + message given via "-m" and "-F" to be further edited. + * "git fetch --prune-tags" may be used as a handy short-hand for + getting rid of stale tags that are locally held. + * The new "--show-current-patch" option gives an end-user facing way + to get the diff being applied when "git rebase" (and "git am") + stops with a conflict. + * "git add -p" used to offer "/" (look for a matching hunk) as a + choice, even there was only one hunk, which has been corrected. + Also the single-key help is now given only for keys that are + enabled (e.g. help for '/' won't be shown when there is only one + hunk). + * Since Git 1.7.9, "git merge" defaulted to --no-ff (i.e. even when + the side branch being merged is a descendant of the current commit, + create a merge commit instead of fast-forwarding) when merging a + tag object. This was appropriate default for integrators who pull + signed tags from their downstream contributors, but caused an + unnecessary merges when used by downstream contributors who + habitually "catch up" their topic branches with tagged releases + from the upstream. Update "git merge" to default to --no-ff only + when merging a tag object that does *not* sit at its usual place in + refs/tags/ hierarchy, and allow fast-forwarding otherwise, to + mitigate the problem. + * "git status" can spend a lot of cycles to compute the relation + between the current branch and its upstream, which can now be + disabled with "--no-ahead-behind" option. + * "git diff" and friends learned funcname patterns for Go language + source files. + * "git send-email" learned "--reply-to=
" option. + * Funcname pattern used for C# now recognizes "async" keyword. + * In a way similar to how "git tag" learned to honor the pager + setting only in the list mode, "git config" learned to ignore the + pager setting when it is used for setting values (i.e. when the + purpose of the operation is not to "show"). + ------------------------------------------------------------------- Tue Mar 27 11:55:21 CEST 2018 - kukuk@suse.de diff --git a/git.spec b/git.spec index 8e08ef5..889192d 100644 --- a/git.spec +++ b/git.spec @@ -35,7 +35,7 @@ %bcond_without docs Name: git -Version: 2.16.3 +Version: 2.17.0 Release: 0 Summary: Fast, scalable, distributed revision control system License: GPL-2.0-only @@ -87,6 +87,7 @@ BuildRequires: libsha1detectcoll-devel %endif BuildRequires: pcre2-devel BuildRequires: perl-Error +BuildRequires: perl-MailTools BuildRequires: python3 BuildRequires: sgml-skel BuildRequires: systemd-rpm-macros @@ -218,6 +219,7 @@ system. Summary: Git tools for sending email Group: Development/Tools/Version Control Requires: git-core = %{version} +Requires: perl-MailTools # For sending mails over secure SMTP: Recommends: perl-Net-SMTP-SSL, perl-Authen-SASL @@ -307,10 +309,12 @@ make %{_smp_mflags} CFLAGS="%{optflags}" \ %endif PYTHON_PATH=%{_bindir}/python3 \ USE_LIBPCRE2=YesPlease \ + NO_PERL_CPAN_FALLBACKS=1 \ V=1 \ prefix=%{_prefix} mandir=%{_mandir} \ gitexecdir=%{gitexecdir} \ htmldir=%{_docdir}/git \ + perllibdir=%{perl_vendorlib} \ "$@" EOF # @@ -350,11 +354,6 @@ install -m 644 %{S:6} %{buildroot}/%{_fwdefdir}/git-daemon (find %{buildroot}%{_bindir} -type f -o -type l | grep -vE "archimport|p4|svn|cvs|email|gitk|git-daemon|gui" | sed -e s@^%{buildroot}@@) > bin-man-doc-files (find %{buildroot}%{gitexecdir} ! -type d | grep -vE "archimport|p4|svn|cvs|email|gitk|git-daemon|gui" | sed -e s@^%{buildroot}@@) >> bin-man-doc-files (find %{buildroot}%{_mandir} -type f | grep -vE "archimport|p4|svn|git-cvs|email|gitk|git-daemon|gui" | sed -e s@^%{buildroot}@@ -e 's/$/*/' ) >> bin-man-doc-files -( pushd perl - perl Makefile.PL - make -f perl.mak DESTDIR=%{buildroot} install_vendor -) -rm -rf %{buildroot}/usr/lib/perl5/site_perl %perl_process_packlist find %{buildroot}/%_mandir -type f -print0 | xargs -0 chmod 644 install -m 644 -D contrib/completion/git-completion.bash %{buildroot}/etc/bash_completion.d/git.sh @@ -505,9 +504,7 @@ fi %if 0%{?suse_version} < 1140 /var/adm/perl-modules/%{name} %endif -%{perl_vendorlib}/Git.pm -%{perl_vendorlib}/Git/ -%{perl_vendorarch}/auto/Git/ +%attr(-,root,root) %{perl_vendorlib}/* /etc/bash_completion.d/*.sh %{_datadir}/tcsh /etc/profile.d/*.csh