Accepting request 72811 from devel:tools:scm

- 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

- updated to git 1.7.5.4: see git changelog for more details

- Fix incompatibilies with git 1.7.5.x to build cgit again (forwarded request 72784 from tiwai)

OBS-URL: https://build.opensuse.org/request/show/72811
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=58

cgit-git-1.7.5.x-build-fix.diff

@@ -0,0 +1,43 @@
+---
+ 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);

cgit.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jun  6 16:03:34 CEST 2011 - tiwai@suse.de
+
+- updated to git 1.7.5.4: see git changelog for more details
+
+-------------------------------------------------------------------
+Mon Jun  6 12:24:02 CEST 2011 - tiwai@suse.de
+
+- Fix incompatibilies with git 1.7.5.x to build cgit again
+
 -------------------------------------------------------------------
 Wed Jun  1 12:41:12 UTC 2011 - mmarek@novell.com
 

cgit.spec

@@ -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/
@@ -31,6 +31,7 @@ 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 @@ Authors:
 %setup -q
 %setup -q -T -D -a 1
 %patch -p1
+%patch1 -p1
 rm -rf git
 mv git-%{git_version} git
 

git-1.7.5.3.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8017b0c624fea88bf5488d35f3839778fac3c0e089a02fe0017aea6913af3292
-size 2766856

git-1.7.5.4.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fed9a6c7d07b063cfba9e3eb40fbd0d8120785225289fcf2fb56bee18dffd5ee
+size 2768851

git.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun  6 16:02:12 CEST 2011 - tiwai@suse.de
+
+- 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
+
 -------------------------------------------------------------------
 Fri May 27 11:43:23 CEST 2011 - tiwai@suse.de
 

git.spec

@@ -38,7 +38,7 @@ BuildRequires:  sgml-skel
 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+