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
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
parent
a5f1009f43
commit
26c472cc4e
Binary file not shown.
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d65d99e9e5b081c1f14ea018973806e942a2eb7d0da2ebc01bd2525adee62d48
|
||||
size 4966248
|
||||
BIN
git-2.17.0.tar.sign
Normal file
BIN
git-2.17.0.tar.sign
Normal file
Binary file not shown.
3
git-2.17.0.tar.xz
Normal file
3
git-2.17.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e916e5e95e81dbeafa7aac5d719c01108b5c814eb90b746695afa1afedf955c7
|
||||
size 5011556
|
||||
53
git.changes
53
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=<object-id>" 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=<address>" 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
|
||||
|
||||
|
||||
15
git.spec
15
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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user