From 91c5201da51b62410833ecc2ad4b383a21e7cb8b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 01:26:21 +0000 Subject: [PATCH 1/9] Initialize branch F-13 for git --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From fec99d545157cde2381cad2c604cf3749b7ad9c9 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 1 Mar 2010 14:29:55 +0000 Subject: [PATCH 2/9] Update to git-1.7.0.1 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index b2eda6f..3c2b4ea 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.7.0.tar.bz2 +git-1.7.0.1.tar.bz2 diff --git a/git.spec b/git.spec index a432c06..79793cd 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.0 +Version: 1.7.0.1 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -443,6 +443,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Mon Mar 01 2010 Todd Zullinger - 1.7.0.1-1 +- git-1.7.0.1 + * Sat Feb 13 2010 Todd Zullinger - 1.7.0-1 - git-1.7.0 - Link imap-send with libcrypto (#565147) diff --git a/sources b/sources index 9992ad3..a0c39d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c7553b73e2156d187ece6ba936ae30ab git-1.7.0.tar.bz2 +c4315200efc90ea0f243cf0e86cda1f1 git-1.7.0.1.tar.bz2 From fe0c2cc05979440a28757e35f5b8b153ab819527 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Sat, 12 Jun 2010 12:42:39 +0000 Subject: [PATCH 3/9] Update to git-1.7.1 - Fix conditionals for EL-6 - Comply with Emacs add-on packaging guidelines (#573423), Jonathan Underwood - Place elisp source files in separate emacs-git-el package - Place git support files in own directory under site-lisp - Use Emacs packaging macros --- .cvsignore | 2 +- git.spec | 84 +++++++++++++++++++++++++++++++++++------------------- sources | 2 +- 3 files changed, 56 insertions(+), 32 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3c2b4ea..74d9875 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.7.0.1.tar.bz2 +git-1.7.1.tar.bz2 diff --git a/git.spec b/git.spec index 79793cd..90a0137 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.0.1 +Version: 1.7.1 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -26,7 +26,7 @@ Patch2: git-1.6-update-contrib-hooks-path.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 6 BuildRequires: emacs >= 22.2 BuildRequires: libcurl-devel %else @@ -68,19 +68,21 @@ SCMs, install the git-all meta-package. %package all Summary: Meta-package to pull in all git tools Group: Development/Tools -%if 0%{?fedora} >= 10 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 BuildArch: noarch %endif Requires: git = %{version}-%{release} -Requires: git-svn = %{version}-%{release} +%if 0%{?fedora} +Requires: git-arch = %{version}-%{release} +%endif Requires: git-cvs = %{version}-%{release} Requires: git-email = %{version}-%{release} -Requires: gitk = %{version}-%{release} Requires: git-gui = %{version}-%{release} +Requires: git-svn = %{version}-%{release} +Requires: gitk = %{version}-%{release} Requires: perl-Git = %{version}-%{release} -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 6 Requires: emacs-git = %{version}-%{release} -Requires: git-arch = %{version}-%{release} %endif %if 0%{?fedora} || 0%{?rhel} >= 5 Obsoletes: git <= 1.5.4.3 @@ -107,7 +109,7 @@ The git dæmon for supporting git:// access to git repositories %package -n gitweb Summary: Simple web interface to git repositories Group: Development/Tools -%if 0%{?fedora} >= 10 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 BuildArch: noarch %endif Requires: git = %{version}-%{release} @@ -119,7 +121,7 @@ Simple web interface to track changes in git repositories %package svn Summary: Git tools for importing Subversion repositories Group: Development/Tools -%if 0%{?fedora} >= 10 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 BuildArch: noarch %endif Requires: git = %{version}-%{release}, subversion, perl(Term::ReadKey) @@ -129,7 +131,7 @@ Git tools for importing Subversion repositories. %package cvs Summary: Git tools for importing CVS repositories Group: Development/Tools -%if 0%{?fedora} >= 10 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 BuildArch: noarch %endif Requires: git = %{version}-%{release}, cvs @@ -143,9 +145,7 @@ Git tools for importing CVS repositories. %package arch Summary: Git tools for importing Arch repositories Group: Development/Tools -%if 0%{?fedora} >= 10 BuildArch: noarch -%endif Requires: git = %{version}-%{release}, tla %description arch Git tools for importing Arch repositories. @@ -154,7 +154,7 @@ Git tools for importing Arch repositories. %package email Summary: Git tools for sending email Group: Development/Tools -%if 0%{?fedora} >= 10 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 BuildArch: noarch %endif Requires: git = %{version}-%{release}, perl-Git = %{version}-%{release} @@ -168,7 +168,7 @@ Git tools for sending email. %package gui Summary: Git GUI tool Group: Development/Tools -%if 0%{?fedora} >= 10 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 BuildArch: noarch %endif Requires: git = %{version}-%{release}, tk >= 8.4 @@ -179,7 +179,7 @@ Git GUI tool. %package -n gitk Summary: Git revision tree visualiser Group: Development/Tools -%if 0%{?fedora} >= 10 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 BuildArch: noarch %endif Requires: git = %{version}-%{release}, tk >= 8.4 @@ -189,7 +189,7 @@ Git revision tree visualiser. %package -n perl-Git Summary: Perl interface to Git Group: Development/Libraries -%if 0%{?fedora} >= 10 +%if 0%{?fedora} >= 10 || 0%{?rhel} >= 6 BuildArch: noarch %endif Requires: git = %{version}-%{release} @@ -202,17 +202,24 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $versi %description -n perl-Git Perl interface to Git. -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 6 %package -n emacs-git Summary: Git version control system support for Emacs Group: Applications/Editors -%if 0%{?fedora} >= 10 BuildArch: noarch -%endif -Requires: git = %{version}-%{release}, emacs-common >= 22.2 +Requires: git = %{version}-%{release}, emacs(bin) >= %{_emacs_version} %description -n emacs-git %{summary}. + +%package -n emacs-git-el +Summary: Elisp source files for git version control system support for Emacs +Group: Applications/Editors +BuildArch: noarch +Requires: emacs-git = %{version}-%{release} + +%description -n emacs-git-el +%{summary}. %endif %prep @@ -237,7 +244,7 @@ htmldir = %{_docdir}/%{name}-%{version} prefix = %{_prefix} EOF -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 6 cat << \EOF >> config.mak ASCIIDOC8 = 1 ASCIIDOC_NO_ROFF = 1 @@ -262,7 +269,7 @@ chmod +x %{__perl_requires} %build make %{?_smp_mflags} all %{!?_without_docs: doc} -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 6 make -C contrib/emacs %endif @@ -273,15 +280,16 @@ sed -i '/^#!bash/,+1 d' contrib/completion/git-completion.bash rm -rf %{buildroot} make %{?_smp_mflags} INSTALLDIRS=vendor install %{!?_without_docs: install-doc} -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 6 +%global elispdir %{_emacs_sitelispdir}/git make -C contrib/emacs install \ - emacsdir=%{buildroot}%{_datadir}/emacs/site-lisp -for elc in %{buildroot}%{_datadir}/emacs/site-lisp/*.elc ; do + emacsdir=%{buildroot}%{elispdir} +for elc in %{buildroot}%{elispdir}/*.elc ; do install -pm 644 contrib/emacs/$(basename $elc .elc).el \ - %{buildroot}%{_datadir}/emacs/site-lisp + %{buildroot}%{elispdir} done install -Dpm 644 %{SOURCE1} \ - %{buildroot}%{_datadir}/emacs/site-lisp/site-start.d/git-init.el + %{buildroot}%{_emacs_sitestartdir}/git-init.el %endif mkdir -p %{buildroot}%{_var}/www/git @@ -414,12 +422,17 @@ rm -rf %{buildroot} %files -n perl-Git -f perl-files %defattr(-,root,root) -%if 0%{?fedora} +%if 0%{?fedora} || 0%{?rhel} >= 6 %files -n emacs-git %defattr(-,root,root) %doc contrib/emacs/README -%{_datadir}/emacs/site-lisp/*git*.el* -%{_datadir}/emacs/site-lisp/site-start.d/git-init.el +%dir %{elispdir} +%{elispdir}/*.elc +%{_emacs_sitestartdir}/git-init.el + +%files -n emacs-git-el +%defattr(-,root,root) +%{elispdir}/*.el %endif %files daemon @@ -443,6 +456,17 @@ rm -rf %{buildroot} # No files for you! %changelog +* Tue May 04 2010 Todd Zullinger - 1.7.1-1 +- git-1.7.1 +- Fix conditionals for EL-6 +- Comply with Emacs add-on packaging guidelines (#573423), Jonathan Underwood + - Place elisp source files in separate emacs-git-el package + - Place git support files in own directory under site-lisp + - Use Emacs packaging macros + +* Thu Apr 29 2010 Marcela Maslanova - 1.7.0.1-2 +- Mass rebuild with perl-5.12.0 + * Mon Mar 01 2010 Todd Zullinger - 1.7.0.1-1 - git-1.7.0.1 diff --git a/sources b/sources index a0c39d8..2c3f8d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c4315200efc90ea0f243cf0e86cda1f1 git-1.7.0.1.tar.bz2 +3da231dbe82ad103373cb530ae7475d5 git-1.7.1.tar.bz2 From 42e612ad5135f0d96c4c1d380cfe3a34168cd057 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Fri, 2 Jul 2010 13:29:31 +0000 Subject: [PATCH 4/9] - update to 1.7.1.1 --- .cvsignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 74d9875..393c4f7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.7.1.tar.bz2 +git-1.7.1.1.tar.bz2 diff --git a/git.spec b/git.spec index 90a0137..611f2d7 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.1 +Version: 1.7.1.1 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -456,6 +456,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Jul 02 2010 Adam Tkac - 1.7.1.1-1 +- update to 1.7.1.1 + * Tue May 04 2010 Todd Zullinger - 1.7.1-1 - git-1.7.1 - Fix conditionals for EL-6 diff --git a/sources b/sources index 2c3f8d4..4184383 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3da231dbe82ad103373cb530ae7475d5 git-1.7.1.tar.bz2 +1b116a3e2ecce46a89e4272abf0de955 git-1.7.1.1.tar.bz2 From 0020a55dfcefef2c4596d4b04c48ebd49dffff57 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Thu, 22 Jul 2010 11:14:09 +0000 Subject: [PATCH 5/9] - update to 1.7.2 --- .cvsignore | 2 +- git-1.5-gitweb-home-link.patch | 9 +++++---- git.spec | 9 +++++---- sources | 2 +- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.cvsignore b/.cvsignore index 393c4f7..e23ad7a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -git-1.7.1.1.tar.bz2 +git-1.7.2.tar.bz2 diff --git a/git-1.5-gitweb-home-link.patch b/git-1.5-gitweb-home-link.patch index cd36563..74c8390 100644 --- a/git-1.5-gitweb-home-link.patch +++ b/git-1.5-gitweb-home-link.patch @@ -1,7 +1,8 @@ ---- git-1.5.0.6/gitweb/gitweb.perl~ 2007-03-30 01:37:05.000000000 +0100 -+++ git-1.5.0.6/gitweb/gitweb.perl 2007-05-07 08:31:37.000000000 +0100 -@@ -39,7 +39,7 @@ our $projectroot = "++GITWEB_PROJECTROOT - our $home_link = $my_uri || "/"; +diff -up git-1.7.2/gitweb/gitweb.perl.orig git-1.7.2/gitweb/gitweb.perl +--- git-1.7.2/gitweb/gitweb.perl.orig 2010-07-21 23:35:25.000000000 +0200 ++++ git-1.7.2/gitweb/gitweb.perl 2010-07-22 10:49:50.385707086 +0200 +@@ -79,7 +79,7 @@ our $projectroot = "++GITWEB_PROJECTROOT + our $project_maxdepth = "++GITWEB_PROJECT_MAXDEPTH++"; # string of the home link on top of all pages -our $home_link_str = "++GITWEB_HOME_LINK_STR++"; diff --git a/git.spec b/git.spec index 611f2d7..eeeb010 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.1.1 +Version: 1.7.2 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -242,6 +242,7 @@ INSTALL = install -p GITWEB_PROJECTROOT = %{_var}/lib/git htmldir = %{_docdir}/%{name}-%{version} prefix = %{_prefix} +gitwebdir = %{_var}/www/git EOF %if 0%{?fedora} || 0%{?rhel} >= 6 @@ -292,9 +293,6 @@ install -Dpm 644 %{SOURCE1} \ %{buildroot}%{_emacs_sitestartdir}/git-init.el %endif -mkdir -p %{buildroot}%{_var}/www/git -install -pm 644 gitweb/*.{css,js,png} %{buildroot}%{_var}/www/git -install -pm 755 gitweb/gitweb.cgi %{buildroot}%{_var}/www/git mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d install -pm 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf sed "s|@PROJECTROOT@|%{_var}/lib/git|g" \ @@ -456,6 +454,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Jul 22 2010 Adam Tkac - 1.7.2-1 +- update to 1.7.2 + * Fri Jul 02 2010 Adam Tkac - 1.7.1.1-1 - update to 1.7.1.1 diff --git a/sources b/sources index 4184383..188db10 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1b116a3e2ecce46a89e4272abf0de955 git-1.7.1.1.tar.bz2 +652f861ae161e48979ef834707e2dc4c git-1.7.2.tar.bz2 From 14c9be384da60718284881ca42133dbccaa011cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 15:41:16 +0000 Subject: [PATCH 6/9] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index fbfe8aa..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: git -# $Id$ -NAME := git -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 From 9c56bf77d474cb78d5be228df329ec695c3bf12d Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 30 Jul 2010 10:15:19 -0400 Subject: [PATCH 7/9] Update to git-1.7.2.1 --- .gitignore | 2 +- git.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e23ad7a..1dd8967 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -git-1.7.2.tar.bz2 +git-1.7.2.1.tar.bz2 diff --git a/git.spec b/git.spec index eeeb010..685ffdb 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.2 +Version: 1.7.2.1 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -454,6 +454,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Jul 29 2010 Todd Zullinger - 1.7.2.1-1 +- Update to git-1.7.2.1 + * Thu Jul 22 2010 Adam Tkac - 1.7.2-1 - update to 1.7.2 diff --git a/sources b/sources index 188db10..c6e2468 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -652f861ae161e48979ef834707e2dc4c git-1.7.2.tar.bz2 +24a443a120a0ab372185cb6bc0dbd934 git-1.7.2.1.tar.bz2 From 17707f6881aeefc564027061d273091d292e642e Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Fri, 30 Jul 2010 22:52:13 +0200 Subject: [PATCH 8/9] cherry-pick: "Do not unquote + into ' ' in URLs" There are problems with this bug in dist-git. --- git-1.7.2.1-730220de.patch | 86 ++++++++++++++++++++++++++++++++++++++ git.spec | 9 +++- 2 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 git-1.7.2.1-730220de.patch diff --git a/git-1.7.2.1-730220de.patch b/git-1.7.2.1-730220de.patch new file mode 100644 index 0000000..fdf4d2e --- /dev/null +++ b/git-1.7.2.1-730220de.patch @@ -0,0 +1,86 @@ +commit 730220de8be669257287e9a1f5dde349ace5426a +Author: Thomas Rast +Date: Sat Jul 24 16:49:04 2010 +0200 + + Do not unquote + into ' ' in URLs + + Since 9d2e942 (decode file:// and ssh:// URLs, 2010-05-23) the URL + logic unquotes escaped URLs. For the %2B type of escape, this is + conformant with RFC 2396. However, it also unquotes + into a space + character, which is only appropriate for the query strings in HTTP. + This notably broke fetching from the gtk+ repository. + + We cannot just remove the corresponding code since the same + url_decode_internal() is also used by the HTTP backend to decode query + parameters. Introduce a new argument that controls whether the + + decoding happens, and use it only in the (client-side) url_decode(). + + Reported-by: Jasper St. Pierre + Signed-off-by: Thomas Rast + Signed-off-by: Junio C Hamano + +diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh +index 8abb71a..4431dfd 100755 +--- a/t/t5601-clone.sh ++++ b/t/t5601-clone.sh +@@ -178,8 +178,14 @@ test_expect_success 'clone respects global branch.autosetuprebase' ' + + test_expect_success 'respect url-encoding of file://' ' + git init x+y && +- test_must_fail git clone "file://$PWD/x+y" xy-url && +- git clone "file://$PWD/x%2By" xy-url ++ git clone "file://$PWD/x+y" xy-url-1 && ++ git clone "file://$PWD/x%2By" xy-url-2 ++' ++ ++test_expect_success 'do not query-string-decode + in URLs' ' ++ rm -rf x+y && ++ git init "x y" && ++ test_must_fail git clone "file://$PWD/x+y" xy-no-plus + ' + + test_expect_success 'do not respect url-encoding of non-url path' ' +diff --git a/url.c b/url.c +index 2306236..cd8f74f 100644 +--- a/url.c ++++ b/url.c +@@ -67,7 +67,8 @@ static int url_decode_char(const char *q) + return val; + } + +-static char *url_decode_internal(const char **query, const char *stop_at, struct strbuf *out) ++static char *url_decode_internal(const char **query, const char *stop_at, ++ struct strbuf *out, int decode_plus) + { + const char *q = *query; + +@@ -90,7 +91,7 @@ static char *url_decode_internal(const char **query, const char *stop_at, struct + } + } + +- if (c == '+') ++ if (decode_plus && c == '+') + strbuf_addch(out, ' '); + else + strbuf_addch(out, c); +@@ -110,17 +111,17 @@ char *url_decode(const char *url) + strbuf_add(&out, url, colon - url); + url = colon; + } +- return url_decode_internal(&url, NULL, &out); ++ return url_decode_internal(&url, NULL, &out, 0); + } + + char *url_decode_parameter_name(const char **query) + { + struct strbuf out = STRBUF_INIT; +- return url_decode_internal(query, "&=", &out); ++ return url_decode_internal(query, "&=", &out, 1); + } + + char *url_decode_parameter_value(const char **query) + { + struct strbuf out = STRBUF_INIT; +- return url_decode_internal(query, "&", &out); ++ return url_decode_internal(query, "&", &out, 1); + } diff --git a/git.spec b/git.spec index 685ffdb..3b2274f 100644 --- a/git.spec +++ b/git.spec @@ -7,7 +7,7 @@ Name: git Version: 1.7.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Fast Version Control System License: GPLv2 Group: Development/Tools @@ -23,6 +23,9 @@ Patch0: git-1.5-gitweb-home-link.patch Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch # https://bugzilla.redhat.com/500137 Patch2: git-1.6-update-contrib-hooks-path.patch +# Do not unquote + into ' ' in URLs +# cherry-picked from upstream +Patch3: git-1.7.2.1-730220de.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -227,6 +230,7 @@ Requires: emacs-git = %{version}-%{release} %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. @@ -454,6 +458,9 @@ rm -rf %{buildroot} # No files for you! %changelog +* Fri Jul 30 2010 Thomas Spura - 1.7.2.1-2 +- cherry-pick: "Do not unquote + into ' ' in URLs" + * Thu Jul 29 2010 Todd Zullinger - 1.7.2.1-1 - Update to git-1.7.2.1 From 70460985dc76e0cf46d3b28f564b49066297111f Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Thu, 16 Dec 2010 13:49:51 +0100 Subject: [PATCH 9/9] Update to 1.7.3.4. Signed-off-by: Adam Tkac --- .gitignore | 1 + git-1.7.2.1-730220de.patch | 86 -------------------------------------- git.spec | 10 ++--- sources | 2 +- 4 files changed, 7 insertions(+), 92 deletions(-) delete mode 100644 git-1.7.2.1-730220de.patch diff --git a/.gitignore b/.gitignore index 99ca092..25f38ef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ git-1.7.2.1.tar.bz2 /git-1.7.2.2.tar.bz2 /git-1.7.2.3.tar.bz2 +/git-1.7.3.4.tar.bz2 diff --git a/git-1.7.2.1-730220de.patch b/git-1.7.2.1-730220de.patch deleted file mode 100644 index fdf4d2e..0000000 --- a/git-1.7.2.1-730220de.patch +++ /dev/null @@ -1,86 +0,0 @@ -commit 730220de8be669257287e9a1f5dde349ace5426a -Author: Thomas Rast -Date: Sat Jul 24 16:49:04 2010 +0200 - - Do not unquote + into ' ' in URLs - - Since 9d2e942 (decode file:// and ssh:// URLs, 2010-05-23) the URL - logic unquotes escaped URLs. For the %2B type of escape, this is - conformant with RFC 2396. However, it also unquotes + into a space - character, which is only appropriate for the query strings in HTTP. - This notably broke fetching from the gtk+ repository. - - We cannot just remove the corresponding code since the same - url_decode_internal() is also used by the HTTP backend to decode query - parameters. Introduce a new argument that controls whether the + - decoding happens, and use it only in the (client-side) url_decode(). - - Reported-by: Jasper St. Pierre - Signed-off-by: Thomas Rast - Signed-off-by: Junio C Hamano - -diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh -index 8abb71a..4431dfd 100755 ---- a/t/t5601-clone.sh -+++ b/t/t5601-clone.sh -@@ -178,8 +178,14 @@ test_expect_success 'clone respects global branch.autosetuprebase' ' - - test_expect_success 'respect url-encoding of file://' ' - git init x+y && -- test_must_fail git clone "file://$PWD/x+y" xy-url && -- git clone "file://$PWD/x%2By" xy-url -+ git clone "file://$PWD/x+y" xy-url-1 && -+ git clone "file://$PWD/x%2By" xy-url-2 -+' -+ -+test_expect_success 'do not query-string-decode + in URLs' ' -+ rm -rf x+y && -+ git init "x y" && -+ test_must_fail git clone "file://$PWD/x+y" xy-no-plus - ' - - test_expect_success 'do not respect url-encoding of non-url path' ' -diff --git a/url.c b/url.c -index 2306236..cd8f74f 100644 ---- a/url.c -+++ b/url.c -@@ -67,7 +67,8 @@ static int url_decode_char(const char *q) - return val; - } - --static char *url_decode_internal(const char **query, const char *stop_at, struct strbuf *out) -+static char *url_decode_internal(const char **query, const char *stop_at, -+ struct strbuf *out, int decode_plus) - { - const char *q = *query; - -@@ -90,7 +91,7 @@ static char *url_decode_internal(const char **query, const char *stop_at, struct - } - } - -- if (c == '+') -+ if (decode_plus && c == '+') - strbuf_addch(out, ' '); - else - strbuf_addch(out, c); -@@ -110,17 +111,17 @@ char *url_decode(const char *url) - strbuf_add(&out, url, colon - url); - url = colon; - } -- return url_decode_internal(&url, NULL, &out); -+ return url_decode_internal(&url, NULL, &out, 0); - } - - char *url_decode_parameter_name(const char **query) - { - struct strbuf out = STRBUF_INIT; -- return url_decode_internal(query, "&=", &out); -+ return url_decode_internal(query, "&=", &out, 1); - } - - char *url_decode_parameter_value(const char **query) - { - struct strbuf out = STRBUF_INIT; -- return url_decode_internal(query, "&", &out); -+ return url_decode_internal(query, "&", &out, 1); - } diff --git a/git.spec b/git.spec index a679e27..83d0723 100644 --- a/git.spec +++ b/git.spec @@ -6,7 +6,7 @@ %endif Name: git -Version: 1.7.2.3 +Version: 1.7.3.4 Release: 1%{?dist} Summary: Fast Version Control System License: GPLv2 @@ -23,9 +23,6 @@ Patch0: git-1.5-gitweb-home-link.patch Patch1: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch # https://bugzilla.redhat.com/500137 Patch2: git-1.6-update-contrib-hooks-path.patch -# Do not unquote + into ' ' in URLs -# cherry-picked from upstream -Patch3: git-1.7.2.1-730220de.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -230,7 +227,6 @@ Requires: emacs-git = %{version}-%{release} %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 # Use these same options for every invocation of 'make'. # Otherwise it will rebuild in %%install due to flags changes. @@ -458,6 +454,10 @@ rm -rf %{buildroot} # No files for you! %changelog +* Thu Dec 16 2010 Adam Tkac - 1.7.3.4-1 +- update to 1.7.3.4 + - git-1.7.2.1-730220de.patch merged + * Tue Sep 07 2010 Adam Tkac - 1.7.2.3-1 - update to 1.7.2.3 diff --git a/sources b/sources index 461cff7..f53a6a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d88c06f6442156686deb4b4fbab0954c git-1.7.2.3.tar.bz2 +3a2602016f98c529cda7b9fad1a6e216 git-1.7.3.4.tar.bz2