Hello community,
here is the log from the commit of package cgit for openSUSE:Factory checked in
at 2011-11-25 11:11:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cgit (Old)
and /work/SRC/openSUSE:Factory/.cgit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cgit", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/cgit/cgit.changes 2011-10-18
13:53:09.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cgit.new/cgit.changes 2011-11-25
10:12:14.000000000 +0100
@@ -1,0 +2,15 @@
+Tue Nov 22 09:24:35 UTC 2011 - sasc...@suse.de
+
+- Add patch cgit-fix-print-tree.diff:
+ The cgit build fix with respect to git-1.7.6 is incomplete: in
+ the file ui-tree.c ls_tree() has been patched to use pathspec
+ when invoking read_tree_recursive(), but cgit_print_tree() has
+ no t been touched.
+
+ The resulting problem can be seen when browsing the tree of a cgit
+ repository: when you "drill down" into subfolders, parts of the
+ parent folder's contents will appear in the listing.
+
+ This patch adjusts cgit_print_tree() accordingly, which fixes the problem.
+
+-------------------------------------------------------------------
New:
----
cgit-fix-print-tree.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cgit.spec ++++++
--- /var/tmp/diff_new_pack.wLCufm/_old 2011-11-25 10:12:16.000000000 +0100
+++ /var/tmp/diff_new_pack.wLCufm/_new 2011-11-25 10:12:16.000000000 +0100
@@ -33,6 +33,7 @@
Patch: cgit-optflags.diff
Patch1: cgit-git-1.7.6_build_fix.patch
Patch2: cgit-CVE-2011-2711-fix.diff
+Patch3: cgit-fix-print-tree.diff
# Requirements for cgit
BuildRequires: gnu-crypto libopenssl-devel libzip-devel
# Requirements for cgitrc man page generation
@@ -53,6 +54,7 @@
%patch -p1
%patch1 -p1
%patch2 -p1
+%patch3
rm -rf git
mv git-%{git_version} git
++++++ cgit-fix-print-tree.diff ++++++
--- ui-tree.c 2011-11-17 18:00:20.036822908 +0100
+++ ui-tree.c 2011-11-17 18:01:22.396236999 +0100
@@ -262,6 +262,7 @@
unsigned char sha1[20];
struct commit *commit;
const char *paths[] = {path, NULL};
+ struct pathspec pathspec;
if (!rev)
rev = ctx.qry.head;
@@ -283,6 +284,8 @@
}
match_path = path;
- read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
+ init_pathspec(&pathspec, paths);
+ read_tree_recursive(commit->tree, "", 0, 0, &pathspec, walk_tree, NULL);
+ free_pathspec(&pathspec);
ls_tail();
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
