SHA256
1
0
forked from pool/git

Accepting request 290836 from devel:tools:scm

1

OBS-URL: https://build.opensuse.org/request/show/290836
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=151
This commit is contained in:
Dominique Leuenberger 2015-03-16 08:42:01 +00:00 committed by Git OBS Bridge
parent 943538660f
commit 3fb0376b3d
5 changed files with 110 additions and 12 deletions

View File

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

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:475544098567e02ec2320b2c006f39fc6a132fd14a97a3dc7d6ea6ad9be14687
size 3618048

View File

@ -1,12 +1,12 @@
---
contrib/completion/git-completion.tcsh | 7 ++-----
contrib/completion/git-completion.tcsh | 17 +++++++----------
contrib/completion/git.csh | 4 ++++
contrib/completion/git.tcsh | 4 ++++
3 files changed, 10 insertions(+), 5 deletions(-)
3 files changed, 15 insertions(+), 10 deletions(-)
--- a/contrib/completion/git-completion.tcsh
+++ b/contrib/completion/git-completion.tcsh
@@ -34,8 +34,8 @@ if ( ${__git_tcsh_completion_version[1]}
@@ -32,14 +32,14 @@ if ( ${__git_tcsh_completion_version[1]}
endif
unset __git_tcsh_completion_version
@ -15,9 +15,20 @@
+set __git_tcsh_completion_original_script = /etc/bash_completion.d/git.sh
+set __git_tcsh_completion_script = $RPM_BUILD_ROOT/usr/share/tcsh/git.complete
# Check that the user put the script in the right place
if ( ! -e ${__git_tcsh_completion_original_script} ) then
@@ -123,6 +123,3 @@ EOF
-# Check that the user put the script in the right place
-if ( ! -e ${__git_tcsh_completion_original_script} ) then
- echo "git-completion.tcsh: Cannot find: ${__git_tcsh_completion_original_script}. Git completion will not work."
- exit
-endif
+# # Check that the user put the script in the right place
+# if ( ! -e ${__git_tcsh_completion_original_script} ) then
+# echo "git-completion.tcsh: Cannot find: ${__git_tcsh_completion_original_script}. Git completion will not work."
+# exit
+# endif
cat << EOF > ${__git_tcsh_completion_script}
#!bash
@@ -121,6 +121,3 @@ EOF
# Don't need this variable anymore, so don't pollute the users environment
unset __git_tcsh_completion_original_script

View File

@ -1,3 +1,92 @@
-------------------------------------------------------------------
Sat Mar 14 19:05:25 UTC 2015 - astieger@suse.com
- git 2.3.3:
* A corrupt input to "git diff -M" used cause us to segfault.
* The borrowed code in kwset API did not follow our usual convention
to use "unsigned char" to store values that range from 0-255.
* Description given by "grep -h" for its --exclude-standard option
was phrased poorly.
* Documentaton for "git remote add" mentioned "--tags" and
"--no-tags" and it was not clear that fetch from the remote in
the future will use the default behaviour when neither is given
to override it.
* "git diff --shortstat --dirstat=changes" showed a dirstat based on
lines that was never asked by the end user in addition to the
dirstat that the user asked for.
* The interaction between "git submodule update" and the
submodule.*.update configuration was not clearly documented.
* "git apply" was not very careful about reading from, removing,
updating and creating paths outside the working tree (under
--index/--cached) or the current directory (when used as a
replacement for GNU patch).
* "git daemon" looked up the hostname even when "%CH" and "%IP"
interpolations are not requested, which was unnecessary.
* The "interpolated-path" option of "git daemon" inserted any string
client declared on the "host=" capability request without checking.
Sanitize and limit %H and %CH to a saner and a valid DNS name.
-------------------------------------------------------------------
Thu Mar 12 16:19:14 CET 2015 - tiwai@suse.de
- Fix missing /usr/share/tcsh/git.complete (bnc#919105):
git-tcsh-completion-fixes.diff was refreshed for generating the
script correctly
-------------------------------------------------------------------
Sat Mar 7 06:20:42 UTC 2015 - astieger@suse.com
- git 2.3.2:
* "update-index --refresh" used to leak when an entry cannot be
refreshed for whatever reason.
* "git fast-import" used to crash when it could not close and
conclude the resulting packfile cleanly.
* "git blame" died, trying to free an uninitialized piece of memory.
* "git merge-file" did not work correctly in a subdirectory.
* "git submodule add" failed to squash "path/to/././submodule" to
"path/to/submodule".
* In v2.2.0, we broke "git prune" that runs in a repository that
borrows from an alternate object store.
* Certain older vintages of cURL give irregular output from
"curl-config --vernum", which confused our build system.
* Longstanding configuration variable naming rules has been added to
the documentation.
* Older GnuPG implementations may not correctly import the keyring
material we prepare for the tests to use.
* Clarify in the documentation that "remote.<nick>.pushURL" and
"remote.<nick>.URL" are there to name the same repository accessed
via different transports, not two separate repositories.
* The pack bitmap support did not build with older versions of GCC.
* Reading configuration from a blob object, when it ends with a lone
CR, use to confuse the configuration parser.
* We didn't format an integer that wouldn't fit in "int" but in
"uintmax_t" correctly.
* "git push --signed" gave an incorrectly worded error message when
the other side did not support the capability.
* "git fetch" over a remote-helper that cannot respond to "list"
command could not fetch from a symbolic reference e.g. HEAD.
* The insn sheet "git rebase -i" creates did not fully honor
core.abbrev settings.
* The tests that wanted to see that file becomes unreadable after
running "chmod a-r file", and the tests that wanted to make sure it
is not run as root, we used "can we write into the / directory?" as
a cheap substitute, but on some platforms that is not a good
heuristics. The tests and their prerequisites have been updated to
check what they really require.
* The configuration variable 'mailinfo.scissors' was hard to
discover in the documentation.
* Correct a breakage to git-svn around v2.2 era that triggers
premature closing of FileHandle.
* Even though we officially haven't dropped Perl 5.8 support, the
Getopt::Long package that came with it does not support "--no-"
prefix to negate a boolean option; manually add support to help
people with older Getopt::Long package.
-------------------------------------------------------------------
Wed Mar 4 17:11:05 UTC 2015 - schwab@linux-m68k.org
- Don't install dummy hg and bzr remote helpers
-------------------------------------------------------------------
Thu Feb 26 17:14:53 UTC 2015 - astieger@suse.com

View File

@ -26,7 +26,7 @@
%endif
Name: git
Version: 2.3.1
Version: 2.3.3
Release: 0
Summary: Fast, scalable, distributed revision control system
License: GPL-2.0
@ -281,8 +281,6 @@ install -m 644 %{S:6} $RPM_BUILD_ROOT/%{_fwdefdir}/git-daemon
###
./.make -C contrib/subtree install
%{!?_without_docs: ./.make -C contrib/subtree install-doc}
install -m 755 -D contrib/remote-helpers/git-remote-bzr $RPM_BUILD_ROOT%{gitexecdir}
install -m 755 -D contrib/remote-helpers/git-remote-hg $RPM_BUILD_ROOT%{gitexecdir}
(find $RPM_BUILD_ROOT%{_bindir} -type f -o -type l | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files
(find $RPM_BUILD_ROOT%{gitexecdir} ! -type d | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) >> bin-man-doc-files
(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files