diff --git a/cgit.changes b/cgit.changes index 601ae8b..8e3fc3b 100644 --- a/cgit.changes +++ b/cgit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 27 18:22:11 CEST 2011 - tiwai@suse.de + +- updated to git 1.7.6: see git changelog for more details + ------------------------------------------------------------------- Mon Jun 6 16:03:34 CEST 2011 - tiwai@suse.de diff --git a/cgit.spec b/cgit.spec index f056194..08a9901 100644 --- a/cgit.spec +++ b/cgit.spec @@ -17,7 +17,7 @@ # norootforbuild -%define git_version 1.7.5.4 +%define git_version 1.7.6 Name: cgit Url: http://hjemli.net/git/cgit/ diff --git a/completion-wordbreaks.diff b/completion-wordbreaks.diff index cd1a294..65d2312 100644 --- a/completion-wordbreaks.diff +++ b/completion-wordbreaks.diff @@ -4,9 +4,9 @@ --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash -@@ -72,10 +72,12 @@ - # git@vger.kernel.org - # +@@ -77,10 +77,12 @@ + autoload -U +X bashcompinit && bashcompinit + fi -case "$COMP_WORDBREAKS" in -*:*) : great ;; diff --git a/git-1.7.5.4.tar.bz2 b/git-1.7.5.4.tar.bz2 deleted file mode 100644 index 8824f5b..0000000 --- a/git-1.7.5.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fed9a6c7d07b063cfba9e3eb40fbd0d8120785225289fcf2fb56bee18dffd5ee -size 2768851 diff --git a/git-1.7.6.tar.bz2 b/git-1.7.6.tar.bz2 new file mode 100644 index 0000000..5d2e13c --- /dev/null +++ b/git-1.7.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:778795cece63cd758192378f3a999870cea290181b3a4c9de573c77192561082 +size 2806337 diff --git a/git-nohardlink.diff b/git-nohardlink.diff index c0a46e5..cf9eed1 100644 --- a/git-nohardlink.diff +++ b/git-nohardlink.diff @@ -6,7 +6,7 @@ hardlinks to symlinks again in an unpredicatable way --- a/Makefile +++ b/Makefile -@@ -2133,7 +2133,6 @@ +@@ -2252,7 +2252,6 @@ done && \ for p in $(BUILT_INS); do \ $(RM) "$$execdir/$$p" && \ diff --git a/git-prevent_xss-default.diff b/git-prevent_xss-default.diff index 697be67..bc29335 100644 --- a/git-prevent_xss-default.diff +++ b/git-prevent_xss-default.diff @@ -27,7 +27,7 @@ Signed-off-by: Jakub Narebski } --- a/gitweb/README +++ b/gitweb/README -@@ -236,8 +236,9 @@ +@@ -131,8 +131,9 @@ * $prevent_xss If true, some gitweb features are disabled to prevent content in repositories from launching cross-site scripting (XSS) attacks. Set this @@ -41,7 +41,7 @@ Signed-off-by: Jakub Narebski If server load exceed this value then return "503 Service Unavailable" error. --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl -@@ -162,7 +162,7 @@ +@@ -170,7 +170,7 @@ # Disables features that would allow repository owners to inject script into # the gitweb domain. diff --git a/git-python-install-fix.diff b/git-python-install-fix.diff index b0f87f5..bb28e4f 100644 --- a/git-python-install-fix.diff +++ b/git-python-install-fix.diff @@ -16,7 +16,7 @@ @echo "$(DESTDIR_SQ)$(prefix)/$(PYLIBDIR)" --- a/Makefile +++ b/Makefile -@@ -1718,7 +1718,7 @@ +@@ -1800,7 +1800,7 @@ $(patsubst %.py,%,$(SCRIPT_PYTHON)): % : %.py $(QUIET_GEN)$(RM) $@ $@+ && \ INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C git_remote_helpers -s \ diff --git a/git.changes b/git.changes index 63ee150..49359c7 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Jun 27 18:15:30 CEST 2011 - tiwai@suse.de + +- update to 1.7.6: major update from 1.7.5.x + * Similar to branch names, tagnames that begin with "-" are now + disallowed. + * Simpler handling of a large file depending on core.bigfilethreshold + value + * A magic pathspec ":/" handling + * Some new options and improvements in git-blame, git-commit, git-diff + git-grep, git-format-patch, git-merge, git-svn, etc + * More prepartaion for i18n/l10n. + See Documentation/RelNotes/1.7.6.txt for details. + ------------------------------------------------------------------- Fri Jun 24 11:36:31 CEST 2011 - tiwai@suse.de diff --git a/git.spec b/git.spec index 217a62b..378bacf 100644 --- a/git.spec +++ b/git.spec @@ -38,8 +38,8 @@ BuildRequires: sgml-skel BuildRequires: xmlto BuildRequires: python BuildRequires: perl-Error -Version: 1.7.5.4 -Release: 5 +Version: 1.7.6 +Release: 1 Summary: Fast, scalable, distributed revision control system License: GPLv2+ Group: Development/Tools/Version Control