Accepting request 453877 from devel:tools:scm
1 OBS-URL: https://build.opensuse.org/request/show/453877 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=192
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
parent
f113746ab8
commit
bde1479acf
@ -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 ; ... '".
|
||||
|
||||
|
||||
@ -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=`
|
||||
|
||||
@ -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
|
||||
|
||||
@ -11,8 +11,10 @@ v2.11.0-rc0~31^2^2~14 “git-gui: sort entries in tclIndex”.
|
||||
|
||||
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
|
||||
|
||||
--- 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 \
|
||||
|
||||
@ -12,9 +12,11 @@ Signed-off-by: Jakub Narebski <jnareb@...il.com>
|
||||
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 @@ Signed-off-by: Jakub Narebski <jnareb@...il.com>
|
||||
\$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.
|
||||
|
||||
@ -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 @@ Index: git-2.4.6/contrib/completion/git-completion.tcsh
|
||||
-
|
||||
-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}"`,'
|
||||
|
||||
@ -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=(
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 1 13:35:04 CET 2017 - lchiquitto@suse.de
|
||||
|
||||
- Refresh all patches to update line numbers
|
||||
- Add old bug reference to allow submission to SLE-12
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 9 17:00:58 UTC 2016 - olaf@aepfle.de
|
||||
|
||||
@ -926,7 +932,7 @@ Wed Oct 29 20:28:18 UTC 2014 - andreas.stieger@gmx.de
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 1 06:49:03 UTC 2014 - bwiedemann@suse.com
|
||||
|
||||
- Adapt git-web to newer apache2 (bnc#898318)
|
||||
- Adapt git-web to newer apache2 (bnc#898318, bnc#897005)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 30 20:32:08 UTC 2014 - andreas.stieger@gmx.de
|
||||
|
||||
2
git.spec
2
git.spec
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user