Accepting request 317543 from devel:tools:scm

1

OBS-URL: https://build.opensuse.org/request/show/317543
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=160
This commit is contained in:
Stephan Kulow 2015-07-21 11:25:30 +00:00 committed by Git OBS Bridge
parent 3454b7cd66
commit 4206602985
7 changed files with 30 additions and 9 deletions

Binary file not shown.

View File

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

BIN
git-2.4.6.tar.sign Normal file

Binary file not shown.

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

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

View File

@ -4,8 +4,10 @@
contrib/completion/git.tcsh | 4 ++++ contrib/completion/git.tcsh | 4 ++++
3 files changed, 15 insertions(+), 10 deletions(-) 3 files changed, 15 insertions(+), 10 deletions(-)
--- a/contrib/completion/git-completion.tcsh Index: git-2.4.6/contrib/completion/git-completion.tcsh
+++ b/contrib/completion/git-completion.tcsh ===================================================================
--- git-2.4.6.orig/contrib/completion/git-completion.tcsh
+++ git-2.4.6/contrib/completion/git-completion.tcsh
@@ -32,14 +32,14 @@ if ( ${__git_tcsh_completion_version[1]} @@ -32,14 +32,14 @@ if ( ${__git_tcsh_completion_version[1]}
endif endif
unset __git_tcsh_completion_version unset __git_tcsh_completion_version
@ -26,7 +28,7 @@
+# exit +# exit
+# endif +# endif
cat << EOF > ${__git_tcsh_completion_script} cat << EOF >! ${__git_tcsh_completion_script}
#!bash #!bash
@@ -121,6 +121,3 @@ EOF @@ -121,6 +121,3 @@ EOF
@ -35,15 +37,19 @@
- -
-complete git 'p,*,`bash ${__git_tcsh_completion_script} git "${COMMAND_LINE}"`,' -complete git 'p,*,`bash ${__git_tcsh_completion_script} git "${COMMAND_LINE}"`,'
-complete gitk 'p,*,`bash ${__git_tcsh_completion_script} gitk "${COMMAND_LINE}"`,' -complete gitk 'p,*,`bash ${__git_tcsh_completion_script} gitk "${COMMAND_LINE}"`,'
Index: git-2.4.6/contrib/completion/git.csh
===================================================================
--- /dev/null --- /dev/null
+++ b/contrib/completion/git.csh +++ git-2.4.6/contrib/completion/git.csh
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+if (${?prompt}) then +if (${?prompt}) then
+complete git 'p,*,`bash /usr/share/tcsh/git.complete git "${COMMAND_LINE}"`,' +complete git 'p,*,`bash /usr/share/tcsh/git.complete git "${COMMAND_LINE}"`,'
+complete gitk 'p,*,`bash /usr/share/tcsh/git.complete gitk "${COMMAND_LINE}"`,' +complete gitk 'p,*,`bash /usr/share/tcsh/git.complete gitk "${COMMAND_LINE}"`,'
+endif +endif
Index: git-2.4.6/contrib/completion/git.tcsh
===================================================================
--- /dev/null --- /dev/null
+++ b/contrib/completion/git.tcsh +++ git-2.4.6/contrib/completion/git.tcsh
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
+if (${?prompt}) then +if (${?prompt}) then
+complete git 'p,*,`bash /usr/share/tcsh/git.complete git "${COMMAND_LINE}"`,' +complete git 'p,*,`bash /usr/share/tcsh/git.complete git "${COMMAND_LINE}"`,'

View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Fri Jul 17 10:41:11 UTC 2015 - astieger@suse.com
- git 2.4.6:
* "git fetch --depth=<depth>" and "git clone --depth=<depth>"
issued a shallow transfer request even to an upload-pack that
does not support the capability.
* "git fsck" used to ignore missing or invalid objects recorded in
reflog.
* The tcsh completion writes a bash scriptlet but that would have
failed for users with noclobber set.
* "git format-patch --ignore-if-upstream A..B" did not like to be
fed tags as boundary commits.
- git-tcsh-completion-fixes.diff adjusted for context changes
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 26 12:13:19 UTC 2015 - astieger@suse.com Fri Jun 26 12:13:19 UTC 2015 - astieger@suse.com

View File

@ -26,7 +26,7 @@
%endif %endif
Name: git Name: git
Version: 2.4.5 Version: 2.4.6
Release: 0 Release: 0
Summary: Fast, scalable, distributed revision control system Summary: Fast, scalable, distributed revision control system
License: GPL-2.0 License: GPL-2.0