Hello community, here is the log from the commit of package git for openSUSE:Factory checked in at Tue Jun 7 09:13:44 CEST 2011.
-------- --- git/cgit.changes 2011-06-01 14:42:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/git/cgit.changes 2011-06-06 16:11:47.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Jun 6 16:03:34 CEST 2011 - [email protected] + +- updated to git 1.7.5.4: see git changelog for more details + +------------------------------------------------------------------- +Mon Jun 6 12:24:02 CEST 2011 - [email protected] + +- Fix incompatibilies with git 1.7.5.x to build cgit again + +------------------------------------------------------------------- --- git/git.changes 2011-05-27 11:55:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/git/git.changes 2011-06-06 16:11:47.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jun 6 16:02:12 CEST 2011 - [email protected] + +- updated to 1.7.5.4: maintainance update, fixing in git-add -p + option, git diff -C option, and git-rerere merge error fix, etc + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- git-1.7.5.3.tar.bz2 New: ---- cgit-git-1.7.5.x-build-fix.diff git-1.7.5.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cgit.spec ++++++ --- /var/tmp/diff_new_pack.H0xzmo/_old 2011-06-07 09:08:28.000000000 +0200 +++ /var/tmp/diff_new_pack.H0xzmo/_new 2011-06-07 09:08:28.000000000 +0200 @@ -17,7 +17,7 @@ # norootforbuild -%define git_version 1.7.5.3 +%define git_version 1.7.5.4 Name: cgit Url: http://hjemli.net/git/cgit/ @@ -25,12 +25,13 @@ Group: Development/Libraries/C and C++ AutoReqProv: on Version: 0.9 -Release: 2 +Release: 3 Summary: A web frontend for git repositories Source0: %{name}-%{version}.tar.bz2 Source1: git-%{git_version}.tar.bz2 Source2: cgitrc Patch: cgit-optflags.diff +Patch1: cgit-git-1.7.5.x-build-fix.diff # Requirements for cgit BuildRequires: gnu-crypto libopenssl-devel libzip-devel # Requirements for cgitrc man page generation @@ -49,6 +50,7 @@ %setup -q %setup -q -T -D -a 1 %patch -p1 +%patch1 -p1 rm -rf git mv git-%{git_version} git ++++++ git.spec ++++++ --- /var/tmp/diff_new_pack.H0xzmo/_old 2011-06-07 09:08:28.000000000 +0200 +++ /var/tmp/diff_new_pack.H0xzmo/_new 2011-06-07 09:08:28.000000000 +0200 @@ -38,7 +38,7 @@ BuildRequires: xmlto BuildRequires: python BuildRequires: perl-Error -Version: 1.7.5.3 +Version: 1.7.5.4 Release: 1 Summary: Fast, scalable, distributed revision control system License: GPLv2+ ++++++ cgit-git-1.7.5.x-build-fix.diff ++++++ --- shared.c | 11 ++++++----- ui-stats.c | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) --- a/shared.c +++ b/shared.c @@ -312,7 +312,7 @@ { struct diff_options opt; int ret; - int prefixlen; + struct pathspec_item pitem; diff_setup(&opt); opt.output_format = DIFF_FORMAT_CALLBACK; @@ -324,10 +324,11 @@ opt.format_callback = cgit_diff_tree_cb; opt.format_callback_data = fn; if (prefix) { - opt.nr_paths = 1; - opt.paths = &prefix; - prefixlen = strlen(prefix); - opt.pathlens = &prefixlen; + opt.pathspec.nr = 1; + opt.pathspec.raw = &prefix; + pitem.match = prefix; + pitem.len = strlen(prefix); + opt.pathspec.items = &pitem; } diff_setup_done(&opt); --- a/ui-stats.c +++ b/ui-stats.c @@ -239,7 +239,7 @@ init_revisions(&rev, NULL); rev.abbrev = DEFAULT_ABBREV; rev.commit_format = CMIT_FMT_DEFAULT; - rev.no_merges = 1; + rev.max_parents = 1; rev.verbose_header = 1; rev.show_root_diff = 0; setup_revisions(argc, argv, &rev, NULL); ++++++ git-1.7.5.3.tar.bz2 -> git-1.7.5.4.tar.bz2 ++++++ ++++ 3497 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
