From 10c5d9e91c76dff35c6ee0da8a5fef86c4d58de7592b34634ae780436159bc3f Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 21 Dec 2011 09:00:12 +0000 Subject: [PATCH] Accepting request 96975 from devel:tools:scm - Implement %check via make test - Update to v1.7.8 New features: * The date parser now accepts timezone designators that lack minutes part and also has a colon between "hh:mm". * The contents of the /etc/mailname file, if exists, is used as the default value of the hostname part of the committer/author e-mail. * "git am" learned how to read from patches generated by Hg. * "git archive" talking with a remote repository can report errors from the remote side in a more informative way. * "git branch" learned an explicit --list option to ask for branches listed, optionally with a glob matching pattern to limit its output. * "git check-attr" learned "--cached" option to look at .gitattributes files from the index, not from the working tree. * Variants of "git cherry-pick" and "git revert" that take multiple commits learned to "--continue" and "--abort". * "git daemon" gives more human readble error messages to clients using ERR packets when appropriate. * Errors at the network layer is logged by "git daemon". * "git diff" learned "--minimal" option to spend extra cycles to come up with a minimal patch output. * "git diff" learned "--function-context" option to show the whole function as context that was affected by a change. * "git difftool" can be told to skip launching the tool for a path by answering 'n' to its prompt. * "git fetch" learned to honor transfer.fsckobjects configuration to validate the objects that were received from the other end, just like "git receive-pack" (the receiving end of "git push") does. * "git fetch" makes sure that the set of objects it received from the (forwarded request 96521 from namtrac) OBS-URL: https://build.opensuse.org/request/show/96975 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=79 --- git-1.7.7.3.tar.gz | 3 - git-1.7.8.tar.gz | 3 + git-prevent_xss-default.diff | 14 ---- git.changes | 150 +++++++++++++++++++++++++++++++++++ git.spec | 9 +-- 5 files changed, 157 insertions(+), 22 deletions(-) delete mode 100644 git-1.7.7.3.tar.gz create mode 100644 git-1.7.8.tar.gz diff --git a/git-1.7.7.3.tar.gz b/git-1.7.7.3.tar.gz deleted file mode 100644 index f2a2e20..0000000 --- a/git-1.7.7.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc9d773004cdae17453e330a02de630a1beeeb404d0601b9e8c1aef0a0efd100 -size 3484344 diff --git a/git-1.7.8.tar.gz b/git-1.7.8.tar.gz new file mode 100644 index 0000000..56441bf --- /dev/null +++ b/git-1.7.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ede41a79c83e0d8673ed16c64d5c105e404d953591f9611e44c3964130da0713 +size 3538330 diff --git a/git-prevent_xss-default.diff b/git-prevent_xss-default.diff index bc29335..bc2fb3a 100644 --- a/git-prevent_xss-default.diff +++ b/git-prevent_xss-default.diff @@ -25,20 +25,6 @@ Signed-off-by: Jakub Narebski \$feature{'remote_heads'}{'default'} = [1]; EOF } ---- a/gitweb/README -+++ b/gitweb/README -@@ -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 -- to true if you don't trust the content of your repositories. The default -- is false. -+ to false if you trust the content of your repositories, and want to use -+ per-repository README.html, or use gitweb as deployment platform -+ via 'blob_plain' view and path_info links. The default is true. - * $maxload - Used to set the maximum load that we will still respond to gitweb queries. - If server load exceed this value then return "503 Service Unavailable" error. --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -170,7 +170,7 @@ diff --git a/git.changes b/git.changes index a44f3df..8229134 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,153 @@ +------------------------------------------------------------------- +Tue Dec 13 18:11:00 UTC 2011 - idonmez@suse.com + +- Implement %check via make test + +- Update to v1.7.8 + + New features: + + * The date parser now accepts timezone designators that lack minutes + part and also has a colon between "hh:mm". + + * The contents of the /etc/mailname file, if exists, is used as the + default value of the hostname part of the committer/author e-mail. + + * "git am" learned how to read from patches generated by Hg. + + * "git archive" talking with a remote repository can report errors + from the remote side in a more informative way. + + * "git branch" learned an explicit --list option to ask for branches + listed, optionally with a glob matching pattern to limit its output. + + * "git check-attr" learned "--cached" option to look at .gitattributes + files from the index, not from the working tree. + + * Variants of "git cherry-pick" and "git revert" that take multiple + commits learned to "--continue" and "--abort". + + * "git daemon" gives more human readble error messages to clients + using ERR packets when appropriate. + + * Errors at the network layer is logged by "git daemon". + + * "git diff" learned "--minimal" option to spend extra cycles to come + up with a minimal patch output. + + * "git diff" learned "--function-context" option to show the whole + function as context that was affected by a change. + + * "git difftool" can be told to skip launching the tool for a path by + answering 'n' to its prompt. + + * "git fetch" learned to honor transfer.fsckobjects configuration to + validate the objects that were received from the other end, just like + "git receive-pack" (the receiving end of "git push") does. + + * "git fetch" makes sure that the set of objects it received from the + other end actually completes the history before updating the refs. + "git receive-pack" (the receiving end of "git push") learned to do the + same. + + * "git fetch" learned that fetching/cloning from a regular file on the + filesystem is not necessarily a request to unpack a bundle file; the + file could be ".git" with "gitdir: " in it. + + * "git for-each-ref" learned "%(contents:subject)", "%(contents:body)" + and "%(contents:signature)". The last one is useful for signed tags. + + * "git grep" used to incorrectly pay attention to .gitignore files + scattered in the directory it was working in even when "--no-index" + option was used. It no longer does this. The "--exclude-standard" + option needs to be given to explicitly activate the ignore + mechanism. + + * "git grep" learned "--untracked" option, where given patterns are + searched in untracked (but not ignored) files as well as tracked + files in the working tree, so that matches in new but not yet + added files do not get missed. + + * The recursive merge backend no longer looks for meaningless + existing merges in submodules unless in the outermost merge. + + * "git log" and friends learned "--children" option. + + * "git ls-remote" learned to respond to "-h"(elp) requests. + + * "mediawiki" remote helper can interact with (surprise!) MediaWiki + with "git fetch" & "git push". + + * "git merge" learned the "--edit" option to allow users to edit the + merge commit log message. + + * "git rebase -i" can be told to use special purpose editor suitable + only for its insn sheet via sequence.editor configuration variable. + + * "git send-email" learned to respond to "-h"(elp) requests. + + * "git send-email" allows the value given to sendemail.aliasfile to begin + with "~/" to refer to the $HOME directory. + + * "git send-email" forces use of Authen::SASL::Perl to work around + issues between Authen::SASL::Cyrus and AUTH PLAIN/LOGIN. + + * "git stash" learned "--include-untracked" option to stash away + untracked/ignored cruft from the working tree. + + * "git submodule clone" does not leak an error message to the UI + level unnecessarily anymore. + + * "git submodule update" learned to honor "none" as the value for + submodule..update to specify that the named submodule should + not be checked out by default. + + * When populating a new submodule directory with "git submodule init", + the $GIT_DIR metainformation directory for submodules is created inside + $GIT_DIR/modules// directory of the superproject and referenced + via the gitfile mechanism. This is to make it possible to switch + between commits in the superproject that has and does not have the + submodule in the tree without re-cloning. + + * "gitweb" leaked unescaped control characters from syntax hiliter + outputs. + + * "gitweb" can be told to give custom string at the end of the HTML + HEAD element. + + * "gitweb" now has its own manual pages. + + Bugfixes since v1.7.7 + + * HTTP transport did not use pushurl correctly, and also did not tell + what host it is trying to authenticate with when asking for + credentials. + (merge deba493 jk/http-auth later to maint). + + * "git blame" was aborted if started from an uncommitted content and + the path had the textconv filter in effect. + (merge 8518088 ss/blame-textconv-fake-working-tree later to maint). + + * Adding many refs to the local repository in one go (e.g. "git fetch" + that fetches many tags) and looking up a ref by name in a repository + with too many refs were unnecessarily slow. + (merge 17d68a54d jp/get-ref-dir-unsorted later to maint). + + * Report from "git commit" on untracked files was confused under + core.ignorecase option. + (merge 395c7356 jk/name-hash-dirent later to maint). + + * "git merge" did not understand ":/" as a way to name a commit. + + " "git push" on the receiving end used to call post-receive and post-update + hooks for attempted removal of non-existing refs. + (merge 160b81ed ph/push-to-delete-nothing later to maint). + + * Help text for "git remote set-url" and "git remote set-branches" + were misspelled. + (merge c49904e fc/remote-seturl-usage-fix later to maint). + (merge 656cdf0 jc/remote-setbranches-usage-fix later to maint). + ------------------------------------------------------------------- Thu Nov 10 15:29:38 CET 2011 - tiwai@suse.de diff --git a/git.spec b/git.spec index 515696f..de7256b 100644 --- a/git.spec +++ b/git.spec @@ -39,14 +39,13 @@ BuildRequires: sgml-skel BuildRequires: xmlto BuildRequires: python BuildRequires: perl-Error -Version: 1.7.7.3 +Version: 1.7.8 Release: 1 Summary: Fast, scalable, distributed revision control system License: GPL-2.0 Group: Development/Tools/Version Control Url: http://git-scm.com -# Source0: http://kernel.org/pub/software/scm/git/%name-%{version}.tar.bz2 -Source0: %name-%{version}.tar.gz +Source0: http://git-core.googlecode.com/files/%name-%{version}.tar.gz Source1: apache2-gitweb.conf Source2: sysconfig.git-daemon Source3: git-daemon.init @@ -341,8 +340,8 @@ fi %fdupes -s $RPM_BUILD_ROOT %endif -%clean -rm -rf $RPM_BUILD_ROOT +%check +make %{?_smp_mflags} test %pre daemon if ! /usr/bin/getent passwd git-daemon >/dev/null; then