Hello community, here is the log from the commit of package git for openSUSE:Factory checked in at 2012-09-14 12:23:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git (Old) and /work/SRC/openSUSE:Factory/.git.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "git", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/git/git.changes 2012-08-16 21:57:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.git.new/git.changes 2012-09-14 12:23:08.000000000 +0200 @@ -1,0 +2,17 @@ +Wed Sep 12 14:43:30 UTC 2012 - [email protected] + +- git-prompt.sh (for __git_ps1) was broken out of + git-completion.bash. Install it too. + +------------------------------------------------------------------- +Tue Sep 11 14:53:25 CEST 2012 - [email protected] + +- updated to version 1.7.12: + Major version update; new XDG-compliant config file place, + new options, new commands: + See Documentation/RelNotes/1.7.12.txt for details. + +- fix broken bash completion when egrep is aliased with --color + option (bnc#779536) + +------------------------------------------------------------------- Old: ---- git-1.7.11.5.tar.gz New: ---- git-1.7.12.tar.gz git-bash-completion-egrep-color-fix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git.spec ++++++ --- /var/tmp/diff_new_pack.0sIMh7/_old 2012-09-14 12:23:10.000000000 +0200 +++ /var/tmp/diff_new_pack.0sIMh7/_new 2012-09-14 12:23:10.000000000 +0200 @@ -30,7 +30,7 @@ BuildRequires: python BuildRequires: sgml-skel BuildRequires: xmlto -Version: 1.7.11.5 +Version: 1.7.12 Release: 0 Summary: Fast, scalable, distributed revision control system License: GPL-2.0 @@ -47,6 +47,8 @@ Patch3: completion-wordbreaks.diff # CVE-2011-2186, bnc#698456 Patch4: git-prevent_xss-default.diff +# fix broken bash copmletion with colored egrep (bnc#779536) +Patch5: git-bash-completion-egrep-color-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: git-core = %{version} Recommends: git-svn git-cvs git-email gitk git-gui git-web @@ -189,6 +191,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build cat > .make <<'EOF' @@ -243,6 +246,7 @@ %perl_process_packlist find $RPM_BUILD_ROOT/%_mandir -type f -print0 | xargs -0 chmod 644 install -m 644 -D contrib/completion/git-completion.bash $RPM_BUILD_ROOT/etc/bash_completion.d/git.sh +install -m 644 -D contrib/completion/git-prompt.sh $RPM_BUILD_ROOT/etc/bash_completion.d/git-prompt.sh # # apparmor profile for git-web # @@ -373,6 +377,6 @@ %{perl_vendorlib}/Git/ %{perl_vendorlib}/Git/*.pm %{perl_vendorarch}/auto/Git/ -/etc/bash_completion.d/git.sh +/etc/bash_completion.d/*.sh %changelog ++++++ git-1.7.11.5.tar.gz -> git-1.7.12.tar.gz ++++++ ++++ 42065 lines of diff (skipped) ++++++ git-bash-completion-egrep-color-fix.diff ++++++ --- 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 @@ -815,7 +815,7 @@ __git_complete_strategy () __git_list_all_commands () { local i IFS=" "$'\n' - for i in $(git help -a|egrep '^ [a-zA-Z0-9]') + for i in $(git help -a|egrep --color=never '^ [a-zA-Z0-9]') do case $i in *--*) : helper pattern;; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
