Hello community,

here is the log from the commit of package git for openSUSE:Factory checked in 
at 2017-02-06 14:33:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/git (Old)
 and      /work/SRC/openSUSE:Factory/.git.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "git"

Changes:
--------
--- /work/SRC/openSUSE:Factory/git/git.changes  2016-12-19 11:27:30.221341011 
+0100
+++ /work/SRC/openSUSE:Factory/.git.new/git.changes     2017-02-06 
14:33:19.777589780 +0100
@@ -1,0 +2,6 @@
+Wed Feb  1 13:35:04 CET 2017 - [email protected]
+
+- Refresh all patches to update line numbers
+- Add old bug reference to allow submission to SLE-12
+
+-------------------------------------------------------------------
@@ -929 +935 @@
-- Adapt git-web to newer apache2 (bnc#898318)
+- Adapt git-web to newer apache2 (bnc#898318, bnc#897005)

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ git.spec ++++++
--- /var/tmp/diff_new_pack.jDxuAO/_old  2017-02-06 14:33:20.493486333 +0100
+++ /var/tmp/diff_new_pack.jDxuAO/_new  2017-02-06 14:33:20.493486333 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package git
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed

++++++ completion-wordbreaks.diff ++++++
--- /var/tmp/diff_new_pack.jDxuAO/_old  2017-02-06 14:33:20.529481132 +0100
+++ /var/tmp/diff_new_pack.jDxuAO/_new  2017-02-06 14:33:20.529481132 +0100
@@ -2,11 +2,11 @@
  contrib/completion/git-completion.bash |   10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)
 
-Index: git-2.1.0/contrib/completion/git-completion.bash
+Index: git-2.11.0/contrib/completion/git-completion.bash
 ===================================================================
---- git-2.1.0.orig/contrib/completion/git-completion.bash      2014-08-15 
23:26:55.000000000 +0100
-+++ git-2.1.0/contrib/completion/git-completion.bash   2014-08-17 
21:49:40.000000000 +0100
-@@ -28,10 +28,12 @@
+--- git-2.11.0.orig/contrib/completion/git-completion.bash
++++ git-2.11.0/contrib/completion/git-completion.bash
+@@ -29,10 +29,12 @@
  # tell the completion to use commit completion.  This also works with aliases
  # of form "!sh -c '...'".  For example, "!sh -c ': git commit ; ... '".
  


++++++ git-asciidoc.patch ++++++
--- /var/tmp/diff_new_pack.jDxuAO/_old  2017-02-06 14:33:20.545478820 +0100
+++ /var/tmp/diff_new_pack.jDxuAO/_new  2017-02-06 14:33:20.545478820 +0100
@@ -2,8 +2,10 @@
  Documentation/asciidoc.conf |    2 ++
  1 file changed, 2 insertions(+)
 
---- a/Documentation/asciidoc.conf
-+++ b/Documentation/asciidoc.conf
+Index: git-2.11.0/Documentation/asciidoc.conf
+===================================================================
+--- git-2.11.0.orig/Documentation/asciidoc.conf
++++ git-2.11.0/Documentation/asciidoc.conf
 @@ -21,6 +21,8 @@ tilde=~
  apostrophe='
  backtick=`

++++++ git-bash-completion-egrep-color-fix.diff ++++++
--- /var/tmp/diff_new_pack.jDxuAO/_old  2017-02-06 14:33:20.553477665 +0100
+++ /var/tmp/diff_new_pack.jDxuAO/_new  2017-02-06 14:33:20.553477665 +0100
@@ -2,9 +2,11 @@
  contrib/completion/git-completion.bash |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- a/contrib/completion/git-completion.bash
-+++ b/contrib/completion/git-completion.bash
-@@ -536,7 +536,7 @@ __git_commands () {
+Index: git-2.11.0/contrib/completion/git-completion.bash
+===================================================================
+--- git-2.11.0.orig/contrib/completion/git-completion.bash
++++ git-2.11.0/contrib/completion/git-completion.bash
+@@ -627,7 +627,7 @@ __git_commands () {
        then
                printf "%s" "${GIT_TESTING_COMMAND_COMPLETION}"
        else

++++++ git-gui-tclIndex.patch ++++++
--- /var/tmp/diff_new_pack.jDxuAO/_old  2017-02-06 14:33:20.569475353 +0100
+++ /var/tmp/diff_new_pack.jDxuAO/_new  2017-02-06 14:33:20.569475353 +0100
@@ -11,8 +11,10 @@
 
 Signed-off-by: Anders Kaseorg <[email protected]>
 
---- a/git-gui/Makefile
-+++ b/git-gui/Makefile
+Index: git-2.11.0/git-gui/Makefile
+===================================================================
+--- git-2.11.0.orig/git-gui/Makefile
++++ git-2.11.0/git-gui/Makefile
 @@ -252,7 +252,7 @@ $(ALL_MSGFILES): %.msg : %.po
  lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS
        $(QUIET_INDEX)if echo \


++++++ git-prevent_xss-default.diff ++++++
--- /var/tmp/diff_new_pack.jDxuAO/_old  2017-02-06 14:33:20.597471307 +0100
+++ /var/tmp/diff_new_pack.jDxuAO/_new  2017-02-06 14:33:20.597471307 +0100
@@ -12,9 +12,11 @@
  gitweb/gitweb.perl |    2 +-
  3 files changed, 8 insertions(+), 3 deletions(-)
 
---- a/git-instaweb.sh
-+++ b/git-instaweb.sh
-@@ -583,6 +583,10 @@
+Index: git-2.11.0/git-instaweb.sh
+===================================================================
+--- git-2.11.0.orig/git-instaweb.sh
++++ git-2.11.0/git-instaweb.sh
+@@ -598,6 +598,10 @@ our \$projectroot = "$(dirname "$fqgitdi
  our \$git_temp = "$fqgitdir/gitweb/tmp";
  our \$projects_list = \$projectroot;
  
@@ -25,9 +27,11 @@
  \$feature{'remote_heads'}{'default'} = [1];
  EOF
  }
---- a/gitweb/gitweb.perl
-+++ b/gitweb/gitweb.perl
-@@ -170,7 +170,7 @@
+Index: git-2.11.0/gitweb/gitweb.perl
+===================================================================
+--- git-2.11.0.orig/gitweb/gitweb.perl
++++ git-2.11.0/gitweb/gitweb.perl
+@@ -190,7 +190,7 @@ our @diff_opts = ('-M'); # taken from gi
  
  # Disables features that would allow repository owners to inject script into
  # the gitweb domain.

++++++ git-tcsh-completion-fixes.diff ++++++
--- /var/tmp/diff_new_pack.jDxuAO/_old  2017-02-06 14:33:20.613468996 +0100
+++ /var/tmp/diff_new_pack.jDxuAO/_new  2017-02-06 14:33:20.613468996 +0100
@@ -4,10 +4,10 @@
  contrib/completion/git.tcsh            |    4 ++++
  3 files changed, 15 insertions(+), 10 deletions(-)
 
-Index: git-2.4.6/contrib/completion/git-completion.tcsh
+Index: git-2.11.0/contrib/completion/git-completion.tcsh
 ===================================================================
---- git-2.4.6.orig/contrib/completion/git-completion.tcsh
-+++ git-2.4.6/contrib/completion/git-completion.tcsh
+--- git-2.11.0.orig/contrib/completion/git-completion.tcsh
++++ git-2.11.0/contrib/completion/git-completion.tcsh
 @@ -32,14 +32,14 @@ if ( ${__git_tcsh_completion_version[1]}
  endif
  unset __git_tcsh_completion_version
@@ -37,19 +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
+Index: git-2.11.0/contrib/completion/git.csh
 ===================================================================
 --- /dev/null
-+++ git-2.4.6/contrib/completion/git.csh
++++ git-2.11.0/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
+Index: git-2.11.0/contrib/completion/git.tcsh
 ===================================================================
 --- /dev/null
-+++ git-2.4.6/contrib/completion/git.tcsh
++++ git-2.11.0/contrib/completion/git.tcsh
 @@ -0,0 +1,4 @@
 +if (${?prompt}) then
 +complete git  'p,*,`bash /usr/share/tcsh/git.complete git "${COMMAND_LINE}"`,'

++++++ git-zsh-completion-fixes.diff ++++++
--- /var/tmp/diff_new_pack.jDxuAO/_old  2017-02-06 14:33:20.621467840 +0100
+++ /var/tmp/diff_new_pack.jDxuAO/_new  2017-02-06 14:33:20.621467840 +0100
@@ -2,8 +2,10 @@
  contrib/completion/git-completion.zsh |    1 +
  1 file changed, 1 insertion(+)
 
---- a/contrib/completion/git-completion.zsh
-+++ b/contrib/completion/git-completion.zsh
+Index: git-2.11.0/contrib/completion/git-completion.zsh
+===================================================================
+--- git-2.11.0.orig/contrib/completion/git-completion.zsh
++++ git-2.11.0/contrib/completion/git-completion.zsh
 @@ -31,6 +31,7 @@ if [ -z "$script" ]; then
        local e
        locations=(


Reply via email to