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

git-2.4.5.tar.xz

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

git-2.4.6.tar.xz

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

git-tcsh-completion-fixes.diff

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

git.changes

@@ -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
 

git.spec

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