Search
j0ke.net Open Build Service
>
Projects
>
home:opeter
>
git
> git.spec
Sign Up
|
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File git.spec of Package git (Revision 1)
Currently displaying revision
1
,
show latest
# # spec file for package git # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define gitexecdir %_libexecdir/git %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services Name: git BuildRequires: asciidoc BuildRequires: curl BuildRequires: fdupes BuildRequires: libcurl-devel BuildRequires: libexpat-devel BuildRequires: libopenssl-devel BuildRequires: perl-Error BuildRequires: python BuildRequires: sgml-skel BuildRequires: xmlto Version: 1.8.1.1 Release: 1.1 Summary: Fast, scalable, distributed revision control system License: GPL-2.0 Group: Development/Tools/Version Control Url: http://git-scm.com Source0: http://git-core.googlecode.com/files/%name-%{version}.tar.gz Source1: apache2-gitweb.conf Source2: sysconfig.git-daemon Source3: git-daemon.init Source4: git.xinetd Source5: usr.share.git-web.gitweb.cgi Source6: susefirewall-git-daemon Patch2: git-python-install-fix.diff Patch3: completion-wordbreaks.diff # CVE-2011-2186, bnc#698456 Patch4: git-prevent_xss-default.diff # fix broken bash copmletion with colored egrep (bnc#779536) Patch5: git-bash-completion-egrep-color-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: git-core = %{version} Recommends: git-svn git-cvs git-email gitk git-gui git-web Suggests: git-daemon %description Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals. This package itself only provides the README of git but with the packages it requires, it brings you a complete Git environment including GTK and email interfaces and tools for importing source code repositories from other revision control systems such as subversion, CVS, and GNU arch. %package core Summary: Core git tools Group: Development/Tools/Version Control Requires: less Requires: openssh Requires: perl-Error Requires: perl-base = %{perl_version} Requires: rsync %description core Git is a fast, scalable, distributed revision control system with an unusually rich command set that provides both high-level operations and full access to internals. These are the core tools with minimal dependencies. %package svn Summary: Git tools for importing Subversion repositories Group: Development/Tools/Version Control Requires: git-core = %{version} Requires: subversion Requires: subversion-perl %description svn Tools for importing Subversion repositories to the Git version control system. %package cvs Summary: Git tools for importing CVS repositories Group: Development/Tools/Version Control Requires: cvs Requires: cvsps Requires: git-core = %{version} Requires: perl-DBD-SQLite %description cvs Tools for importing CVS repositories to the Git version control system. %package arch Summary: Git tools for importing Arch repositories Group: Development/Tools/Version Control Requires: git-core = %{version} # Requires: tla %description arch Tools for importing GNU Arch repositories to the GIT version control system. %package email Summary: Git tools for sending email Group: Development/Tools/Version Control Requires: git-core = %{version} # For sending mails over secure SMTP: Recommends: perl-Net-SMTP-SSL, perl-Authen-SASL %description email Email interface for the GIT version control system. %package daemon Summary: Simple Server for Git Repositories Group: Development/Tools/Version Control Requires: git-core = %{version} PreReq: /usr/sbin/useradd %fillup_prereq %insserv_prereq %description daemon A really simple TCP git daemon. In the default configuration it allows read only access to repositories in /srv/git/ that contain the 'git-daemon-export-ok' file. %package -n gitk Summary: Git revision tree visualiser Group: Development/Tools/Version Control Requires: git-core = %{version} Requires: tk >= 8.4 Supplements: packageand(git-core:tk) %description -n gitk Grapical tool for visualization of revision trees of projects maintained in the Git version control system. It name gitk indicates that it's written using the Tk Widget set. A simple Tk based graphical interface for common Git operations is found in the package git-gui. %package gui Summary: Grapical tool for common git operations Group: Development/Tools/Version Control Requires: git-core = %{version} Requires: tk >= 8.4 Supplements: packageand(git-core:tk) %description gui A Tcl/Tk based graphical user interface to Git. git-gui focuses on allowing users to make changes to their repository by making new commits, amending existing ones, creating branches, performing local merges, and fetching/pushing to remote repositories. Unlike gitk, git-gui focuses on commit generation and single file annotation, and does not show project history. It does however supply menu actions to start a gitk session from within git-gui. %package web Summary: Git Web Interface Group: Development/Tools/Version Control Requires: git-core = %{version} Supplements: packageand(git-core:apache2) %description web CGI script that allows browsing git repositories via web interface. The apache2 configuration contained in this package installs a virtual directory /git/ that calls the cgi script. %package remote-helpers Summary: Python package for remote helper scripts Group: Development/Tools/Version Control Requires: git-core = %{version} Requires: python %description remote-helpers This package contains the building blocks for remote helpers written in Python. %prep %setup -q %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 %build cat > .make <<'EOF' #!/bin/bash make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \ GITWEB_CONFIG="/etc/gitweb.conf" \ GITWEB_PROJECTROOT="/srv/git" \ WITH_OWN_SUBPROCESS_PY=YesPlease \ DESTDIR=$RPM_BUILD_ROOT \ NO_CROSS_DIRECTORY_HARDLINKS=1 \ NO_INSTALL_HARDLINKS=1 \ V=1 \ prefix=%{_prefix} mandir=%{_mandir} \ gitexecdir=%{gitexecdir} \ htmldir=%{_docdir}/git-core \ "$@" EOF # chmod 755 .make ./.make all %{?_smp_mflags} %{!?_without_docs: ./.make doc} %install ./.make install %{!?_without_docs: install-doc} ### git-web cp gitweb/INSTALL INSTALL.gitweb cp gitweb/README README.gitweb install -d %{buildroot}/usr/share/git-web install -d %{buildroot}/etc/apache2/conf.d install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/apache2/conf.d/gitweb.conf ### git-daemon install -d -m 755 $RPM_BUILD_ROOT/etc/init.d install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/etc/init.d/git-daemon install -d -m 755 $RPM_BUILD_ROOT%{_sbindir} ln -s ../../etc/init.d/git-daemon $RPM_BUILD_ROOT%{_sbindir}/rcgit-daemon install -d -m 755 $RPM_BUILD_ROOT/var/adm/fillup-templates install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.git-daemon install -d -m 755 $RPM_BUILD_ROOT/srv/git install -d -m 755 $RPM_BUILD_ROOT/etc/xinetd.d install -m 644 %{S:4} $RPM_BUILD_ROOT/etc/xinetd.d/git mkdir -p $RPM_BUILD_ROOT/%{_fwdefdir} install -m 644 %{S:6} $RPM_BUILD_ROOT/%{_fwdefdir}/git-daemon ### (find $RPM_BUILD_ROOT%{_bindir} -type f -o -type l | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files (find $RPM_BUILD_ROOT%{gitexecdir} ! -type d | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) >> bin-man-doc-files (find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files ( pushd perl perl Makefile.PL make -f perl.mak DESTDIR=%{buildroot} install_vendor ) rm -rf %{buildroot}/usr/lib/perl5/site_perl %perl_process_packlist find $RPM_BUILD_ROOT/%_mandir -type f -print0 | xargs -0 chmod 644 install -m 644 -D contrib/completion/git-completion.bash $RPM_BUILD_ROOT/etc/bash_completion.d/git.sh install -m 644 -D contrib/completion/git-prompt.sh $RPM_BUILD_ROOT/etc/bash_completion.d/git-prompt.sh # # apparmor profile for git-web # install -d -m 755 $RPM_BUILD_ROOT/etc/apparmor.d install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/apparmor.d # # create predictable symlinks to make apparmor profile work for i in git git-upload-archive git-receive-pack; do rm $RPM_BUILD_ROOT%{_bindir}/$i ln -s %{gitexecdir}/git-add $RPM_BUILD_ROOT%{_bindir}/$i done if ! test -f $RPM_BUILD_ROOT%{gitexecdir}/git-add; then echo "git-add is not a regular file, apparmor profile won't work!" >&2 exit 1 fi %find_lang %{name} cat %{name}.lang >>bin-man-doc-files # use symlinks instead of hardlinks in sub-commands %fdupes -s $RPM_BUILD_ROOT %check ./.make %{?_smp_mflags} test %pre daemon if ! /usr/bin/getent passwd git-daemon >/dev/null; then /usr/sbin/useradd -r -d /var/lib/empty -s /bin/false -c "git daemon" -g nogroup git-daemon || : fi %post daemon %{fillup_and_insserv -n git-daemon} %postun daemon %{insserv_cleanup} %preun daemon %stop_on_removal %files %defattr(-,root,root) %doc README %files svn %defattr(-,root,root) %{gitexecdir}/*svn* %doc Documentation/*svn*.txt %{!?_without_docs: %{_mandir}/man1/*svn*.1*} %{!?_without_docs: %doc Documentation/*svn*.html } %files cvs %defattr(-,root,root) %doc Documentation/*git-cvs*.txt %{_bindir}/git-cvs* %{gitexecdir}/*cvs* %{!?_without_docs: %{_mandir}/man1/*cvs*.1*} %{!?_without_docs: %doc Documentation/*git-cvs*.html } %files arch %defattr(-,root,root) %doc Documentation/git-archimport.txt %{gitexecdir}/git-archimport %{!?_without_docs: %{_mandir}/man1/git-archimport.1*} %{!?_without_docs: %doc Documentation/git-archimport.html } %files email %defattr(-,root,root) %doc Documentation/*email*.txt %{gitexecdir}/*email* %{!?_without_docs: %{_mandir}/man1/*email*.1*} %{!?_without_docs: %doc Documentation/*email*.html } %files daemon %defattr(-,root,root) %doc Documentation/*daemon*.txt %{gitexecdir}/*daemon* /etc/init.d/git-daemon %{_sbindir}/rcgit-daemon %dir /srv/git /var/adm/fillup-templates/sysconfig.git-daemon %{!?_without_docs: %{_mandir}/man1/*daemon*.1*} %{!?_without_docs: %doc Documentation/*daemon*.html } %config(noreplace) /etc/xinetd.d/git %config %{_fwdefdir}/* %files -n gitk %defattr(-,root,root) %doc Documentation/*gitk*.txt %{_bindir}/gitk /usr/share/gitk %{!?_without_docs: %{_mandir}/man1/*gitk*.1*} %{!?_without_docs: %doc Documentation/*gitk*.html } %files gui %defattr(-,root,root) %doc Documentation/*gui*.txt %{gitexecdir}/git-gui* /usr/share/git-gui %{!?_without_docs: %{_mandir}/man1/*gui*.1*} %{!?_without_docs: %doc Documentation/*gui*.html } %files web %defattr(-,root,root) %doc README.gitweb INSTALL.gitweb %dir /etc/apache2 %dir /etc/apache2/conf.d %config(noreplace) /etc/apache2/conf.d/gitweb.conf /usr/share/gitweb /etc/apparmor.d %files remote-helpers %defattr(-,root,root) %if %suse_version >= 1120 %python_sitelib/* %else %py_sitedir/* %endif %files core -f bin-man-doc-files %defattr(-,root,root) %{_datadir}/git-core/ %dir %{gitexecdir} %dir %{gitexecdir}/mergetools %doc README COPYING Documentation/*.txt %{!?_without_docs: %doc Documentation/*.html } %if 0%{?suse_version} < 1140 /var/adm/perl-modules/%{name} %endif %{perl_vendorlib}/Git.pm %{perl_vendorlib}/Git/ %{perl_vendorarch}/auto/Git/ /etc/bash_completion.d/*.sh %changelog * Thu Jan 17 2013 douglarek@outlook.com - updated to version 1.8.1.1: * minor fixes and documentation updates. more details, please see here: https://raw.github.com/git/git/master/Documentation/RelNotes/1.8.1.1.txt * Tue Jan 1 2013 douglarek@outlook.com - updated to version 1.8.1: * a bit of features. * other minor fixes and documentation updates since v1.8.0. more details, please see here: https://raw.github.com/git/git/master/Documentation/RelNotes/1.8.1.txt. * Fri Dec 14 2012 douglarek@outlook.com - updated to version 1.8.0.2: * Various codepaths have workaround for a common misconfiguration to spell "UTF-8" as "utf8", but it was not used uniformly. Most notably, mailinfo (which is used by "git am") lacked this support. * We failed to mention a file without any content change but whose permission bit was modified, or (worse yet) a new file without any content in the "git diff --stat" output. * When "--stat-count" hides a diffstat for binary contents, the total number of added and removed lines at the bottom was computed incorrectly. * When "--stat-count" hides a diffstat for unmerged paths, the total number of affected files at the bottom of the "diff --stat" output was computed incorrectly. * "diff --shortstat" miscounted the total number of affected files when there were unmerged paths. * "git p4" used to try expanding malformed "$keyword$" that spans across multiple lines. * "git update-ref -d --deref SYM" to delete a ref through a symbolic ref that points to it did not remove it correctly. * Syntax highlighting in "gitweb" was not quite working. Also contains other minor fixes and documentation updates. * Tue Nov 27 2012 douglarek@outlook.com - updated to version 1.8.0.1: * a bit of features. * other minor fixes and documentation updates since v1.8.0. more details, please see here: https://raw.github.com/git/git/master/Documentation/RelNotes/1.8.0.1.txt. * Mon Oct 22 2012 douglarek@outlook.com - updated to version 1.8.0: * a lot of features. * minor documentation updates and code clean-ups. * all the fixes since v1.7.12. more details, please see here: https://raw.github.com/git/git/master/Documentation/RelNotes/1.8.0.txt. * Thu Oct 18 2012 douglarek@outlook.com - updated to version 1.7.12.4: * "git fetch" over the dumb-http revision walker could segfault when curl's multi interface was used. * It was possible to give specific paths for "asciidoc" and other tools in the documentation toolchain, but not for "xmlto". * "gitweb" did not give the correct committer timezone in its feed output due to a typo. * The "-Xours" (and similarly -Xtheirs) backend option to "git merge -s recursive" was ignored for binary files. Now it is honored. * The "binary" synthetic attribute made "diff" to treat the path as binary, but not "merge". Also contains many documentation updates. * Thu Oct 11 2012 douglarek@outlook.com - updated to version 1.7.12.3: * "git am" mishandled a patch attached as application/octet-stream (e.g. not text/*); Content-Transfer-Encoding (e.g. base64) was not honored correctly. * It was unclear in the documentation for "git blame" that it is unnecessary for users to use the "--follow" option. * A repository created with "git clone --single" had its fetch refspecs set up just like a clone without "--single", leading the subsequent "git fetch" to slurp all the other branches, defeating the whole point of specifying "only this branch". * "git fetch" over http had an old workaround for an unlikely server misconfiguration; it turns out that this hurts debuggability of the configuration in general, and has been reverted. * "git fetch" over http advertised that it supports "deflate", which is much less common, and did not advertise the more common "gzip" on its Accept-Encoding header. * "git receive-pack" (the counterpart to "git push") did not give progress output while processing objects it received to the puser when run over the smart-http protocol. * "git status" honored the ignore=dirty settings in .gitmodules but "git commit" didn't. Also contains a handful of documentation updates. * Mon Oct 8 2012 schwab@linux-m68k.org - Use ./.make also in %%check to test exactly what was built - Avoid duplicate file warnings * Fri Oct 5 2012 douglarek@outlook.com - updated to version 1.7.12.2: * When "git am" is fed an input that has multiple "Content-type: ..." header, it did not grok charset= attribute correctly. * Even during a conflicted merge, "git blame $path" always meant to blame uncommitted changes to the "working tree" version; make it more useful by showing cleanly merged parts as coming from the other branch that is being merged. * "git blame MAKEFILE" run in a history that has "Makefile" but not "MAKEFILE" should say "No such file MAKEFILE in HEAD", but got confused on a case insensitive filesystem and failed to do so. * "git fetch --all", when passed "--no-tags", did not honor the "--no-tags" option while fetching from individual remotes (the same issue existed with "--tags", but combination "--all --tags" makes much less sense than "--all --no-tags"). * "git log/diff/format-patch --stat" showed the "N line(s) added" comment in user's locale and caused careless submitters to send patches with such a line in them to projects whose project language is not their language, mildly irritating others. Localization to the line has been disabled for now. * "git log --all-match --grep=A --grep=B" ought to show commits that mention both A and B, but when these three options are used with - -author or --committer, it showed commits that mention either A or B (or both) instead. * The subcommand to remove the definition of a remote in "git remote" was named "rm" even though all other subcommands were spelled out. Introduce "git remote remove" to remove confusion, and keep "rm" as a backward compatible synonym. Also contains a handful of documentation updates. * Tue Sep 25 2012 douglarek@outlook.com - updated to version 1.7.12.1: * "git apply -p0" did not parse pathnames on "diff --git" line correctly. This caused patches that had pathnames in no other places to be mistakenly rejected (most notably, binary patch that does not rename nor change mode). Textual patches, renames or mode changes have preimage and postimage pathnames in different places in a form that can be parsed unambiguously and did not suffer from this problem. * "git cherry-pick A C B" used to replay changes in A and then B and then C if these three commits had committer timestamps in that order, which is not what the user who said "A C B" naturally expects. * "git commit --amend" let the user edit the log message and then died when the human-readable committer name was given insufficiently by getpwent(3). * Some capabilities were asked by fetch-pack even when upload-pack did not advertise that they are available. fetch-pack has been fixed not to do so. * "git diff" had a confusion between taking data from a path in the working tree and taking data from an object that happens to have name 0{40} recorded in a tree. * "git for-each-ref" did not correctly support more than one --sort option. * "git log .." errored out saying it is both rev range and a path when there is no disambiguating "--" is on the command line. Update the command line parser to interpret ".." as a path in such a case. * The "--topo-order", "--date-order" (and the lack of either means the default order) options to "rev-list" and "log" family of commands were poorly described in the documentation. * "git prune" without "-v" used to warn about leftover temporary files (which is an indication of an earlier aborted operation). * Pushing to smart HTTP server with recent Git fails without having the username in the URL to force authentication, if the server is configured to allow GET anonymously, while requiring authentication for POST. * The reflog entries left by "git rebase" and "git rebase -i" were inconsistent (the interactive one gave an abbreviated object name). * When "git push" triggered the automatic gc on the receiving end, a message from "git prune" that said it was removing cruft leaked to the standard output, breaking the communication protocol. * "git show --quiet" ought to be a synonym for "git show -s", but wasn't. * "git show --format='%%ci'" did not give timestamp correctly for commits created without human readable name on "committer" line. * "git send-email" did not unquote encoded words that appear on the header correctly, and lost "_" from strings. * The interactive prompt "git send-email" gives was error prone. It asked "What e-mail address do you want to use?" with the address it guessed (correctly) the user would want to use in its prompt, tempting the user to say "y". But the response was taken as "No, please use 'y' as the e-mail address instead", which is most certainly not what the user meant. * "gitweb" when used with PATH_INFO failed to notice directories with SP (and other characters that need URL-style quoting) in them. * When the user gives an argument that can be taken as both a revision name and a pathname without disambiguating with "--", we used to give a help message "Use '--' to separate". The message has been clarified to show where that '--' goes on the command line. * When the user exports a non-default IFS without HT, scripts that rely on being able to parse "ls-files -s | while read a b c..." started to fail. Protect them from such a misconfiguration. * The attribute system may be asked for a path that itself or its leading directories no longer exists in the working tree, and it is fine if we cannot open .gitattribute file in such a case. Failure to open per-directory .gitattributes with error status other than ENOENT and ENOTDIR should be diagnosed, but it wasn't. * After "gitk" showed the contents of a tag, neither "Reread references" nor "Reload" did not update what is shown as the contents of it, when the user overwrote the tag with "git tag -f". * "ciabot" script (in contrib/) has been updated with extensive documentation. * "git-jump" script (in contrib/) did not work well when diff.noprefix or diff.mnemonicprefix is in effect. * Older parts of the documentation described as if having a regular file in .git/refs/ hierarchy were the only way to have branches and tags, which is not true for quite some time. * A utility shell function test_seq has been added as a replacement for the 'seq' utility found on some platforms. * Compatibility wrapper to learn the maximum number of file descriptors we can open around sysconf(_SC_OPEN_MAX) and getrlimit(RLIMIT_NO_FILE) has been introduced for portability. * We used curl_easy_strerror() without checking version of cURL, breaking the build for versions before curl 7.12.0. * Code to work around MacOS X UTF-8 gotcha has been cleaned up. * Fallback 'getpass' implementation made unportable use of stdio API. * The "--rebase" option to "git pull" can be abbreviated to "-r", but we didn't document it. * It was generally understood that "--long-option"s to many of our subcommands can be abbreviated to the unique prefix, but it was not easy to find it described for new readers of the documentation set. * The synopsis said "checkout [-B branch]" to make it clear the branch name is a parameter to the option, but the heading for the option description was "-B::", not "-B branch::", making the documentation misleading. Also contains numerous documentation updates. * Wed Sep 12 2012 frank.lichtenheld@sophos.com - git-prompt.sh (for __git_ps1) was broken out of git-completion.bash. Install it too. * Tue Sep 11 2012 tiwai@suse.de - updated to version 1.7.12: Major version update; new XDG-compliant config file place, new options, new commands: See Documentation/RelNotes/1.7.12.txt for details. - fix broken bash completion when egrep is aliased with --color option (bnc#779536) * Thu Aug 16 2012 tiwai@suse.de - updated to version 1.7.11.5: * The Makefile rule to create assembly output (primarily for debugging purposes) did not create it next to the source. * The code to avoid mistaken attempt to add the object directory itself as its own alternate could read beyond end of a string while comparison. * On some architectures, "block-sha1" did not compile correctly when compilers inferred alignment guarantees from our source we did not intend to make. * When talking to a remote running ssh on IPv6 enabled host, whose address is spelled as "[HOST]:PORT", we did not parse the address correctly and failed to connect. * git-blame.el (in compat/) have been updated to use Elisp more correctly. * "git checkout <branchname>" to come back from a detached HEAD state incorrectly computed reachability of the detached HEAD, resulting in unnecessary warnings. * "git mergetool" did not support --tool-help option to give the list of supported backends, like "git difftool" does. * "git grep" stopped spawning an external "grep" long time ago, but a duplicated test to check internal and external "grep" was left behind. * Tue Aug 7 2012 tiwai@suse.de - updated to version 1.7.11: Major version update; added new options in many commands and new push mode like "simple" See Documentation/RelNotes/1.7.11.txt for details. - updated to version 1.7.11.1, 1.7.11.2, 1.7.11.3, 1.7.11.4: Contains many minor fixes, see below for details Documentation/RelNotes/1.7.11.1.txt Documentation/RelNotes/1.7.11.2.txt Documentation/RelNotes/1.7.11.3.txt Documentation/RelNotes/1.7.11.4.txt * Tue Jun 5 2012 tiwai@suse.de - updated to version 1.7.10.4: just minor fixes in git-checkout, git-grep, git-rebase, updated translations and documents. See Documentation/RelNotes/1.7.10.4.txt for details. * Tue May 29 2012 tiwai@suse.de - updated to version 1.7.10.3: * From this release on, the "git merge" command in an interactive session will start an editor when it automatically resolves the merge for the user to explain the resulting commit, just like the "git commit" command does when it wasn't given a commit message. * The "--binary/-b" options to "git am" have been a no-op for quite a while and were deprecated in mid 2008 (v1.6.0). When you give these options to "git am", it will now warn and ask you not to use them. * When you do not tell which branches and tags to push to the "git push" command in any way, the command used "matching refs" rule to update remote branches and tags with branches and tags with the same name you locally have. See details and more changes in Documentation/RelNotes/1.7.10.txt, 1.7.10.1.txt, 1.7.10.2.txt and 1.7.10.3.txt. * Tue May 1 2012 frank.lichtenheld@sophos.com - Fix build on SLE_11, seems %%files there doesn't support more than one -f option * Mon Feb 27 2012 saschpe@suse.de - Update to version 1.7.9.2: * Bash completion script (in contrib/) did not like a pattern that begins with a dash to be passed to __git_ps1 helper function. * Adaptation of the bash completion script (in contrib/) for zsh incorrectly listed all subcommands when "git <TAB><TAB>" was given to ask for list of porcelain subcommands. * The build procedure for profile-directed optimized binary was not working very well. * Some systems need to explicitly link -lcharset to get locale_charset(). * t5541 ignored user-supplied port number used for HTTP server testing. * The error message emitted when we see an empty loose object was not phrased correctly. * The code to ask for password did not fall back to the terminal input when GIT_ASKPASS is set but does not work (e.g. lack of X with GUI askpass helper). * We failed to give the true terminal width to any subcommand when they are invoked with the pager, i.e. "git -p cmd". * map_user() was not rewriting its output correctly, which resulted in the user visible symptom that "git blame -e" sometimes showed excess '>' at the end of email addresses. * "git checkout -b" did not allow switching out of an unborn branch. * When you have both .../foo and .../foo.git, "git clone .../foo" did not favor the former but the latter. * "git commit" refused to create a commit when entries added with "add -N" remained in the index, without telling Git what their content in the next commit should be. We should have created the commit without these paths. * "git diff --stat" said "files", "insertions", and "deletions" even when it is showing one "file", one "insertion" or one "deletion". * The output from "git diff --stat" for two paths that have the same amount of changes showed graph bars of different length due to the way we handled rounding errors. * "git grep" did not pay attention to -diff (hence -binary) attribute. * The transport programs (fetch, push, clone)ignored --no-progress and showed progress when sending their output to a terminal. * Sometimes error status detected by a check in an earlier phase of "git receive-pack" (the other end of "git push") was lost by later checks, resulting in false indication of success. * "git rev-list --verify" sometimes skipped verification depending on the phase of the moon, which dates back to 1.7.8.x series. * Search box in "gitweb" did not accept non-ASCII characters correctly. * Search interface of "gitweb" did not show multiple matches in the same file correctly. * Thu Feb 9 2012 tiwai@suse.de - updated to v1.7.9: * gitk updates accumulated since early 2011. * git-gui updated to 0.16.0. * git-p4 (in contrib/) updates. * Git uses gettext to translate its most common interface messages into the user's language if translations are available and the locale is appropriately set. Distributors can drop new PO files in po/ to add new translations. * The code to handle username/password for HTTP transactions used in "git push" & "git fetch" learned to talk "credential API" to external programs to cache or store them, to allow integration with platform native keychain mechanisms. * The input prompts in the terminal use our own getpass() replacement when possible. HTTP transactions used to ask for the username without echoing back what was typed, but with this change you will see it as you type. * The internals of "revert/cherry-pick" have been tweaked to prepare building more generic "sequencer" on top of the implementation that drives them. * "git rev-parse FETCH_HEAD" after "git fetch" without specifying what to fetch from the command line will now show the commit that would be merged if the command were "git pull". * "git add" learned to stream large files directly into a packfile instead of writing them into individual loose object files. * "git checkout -B <current branch> <elsewhere>" is a more intuitive way to spell "git reset --keep <elsewhere>". * "git checkout" and "git merge" learned "--no-overwrite-ignore" option to tell Git that untracked and ignored files are not expendable. * "git commit --amend" learned "--no-edit" option to say that the user is amending the tree being recorded, without updating the commit log message. * "git commit" and "git reset" re-learned the optimization to prime the cache-tree information in the index, which makes it faster to write a tree object out after the index entries are updated. * "git commit" detects and rejects an attempt to stuff NUL byte in the commit log message. * "git commit" learned "-S" to GPG-sign the commit; this can be shown with the "--show-signature" option to "git log". * fsck and prune are relatively lengthy operations that still go silent while making the end-user wait. They learned to give progress output like other slow operations. * The set of built-in function-header patterns for various languages knows MATLAB. * "git log --format='<format>'" learned new %%g[nNeE] specifiers to show information from the reflog entries when walking the reflog (i.e. with "-g"). * "git pull" can be used to fetch and merge an annotated/signed tag, instead of the tip of a topic branch. The GPG signature from the signed tag is recorded in the resulting merge commit for later auditing. * "git log" learned "--show-signature" option to show the signed tag that was merged that is embedded in the merge commit. It also can show the signature made on the commit with "git commit -S". * "git branch --edit-description" can be used to add descriptive text to explain what a topic branch is about. * "git fmt-merge-msg" learned to take the branch description into account when preparing a merge summary that "git merge" records when merging a local branch. * "git request-pull" has been updated to convey more information useful for integrators to decide if a topic is worth merging and what is pulled is indeed what the requestor asked to pull, including: - the tip of the branch being requested to be merged; - the branch description describing what the topic is about; - the contents of the annotated tag, when requesting to pull a tag. * "git pull" learned to notice 'pull.rebase' configuration variable, which serves as a global fallback for setting 'branch.<name>.rebase' configuration variable per branch. * "git tag" learned "--cleanup" option to control how the whitespaces and empty lines in tag message are cleaned up. * "gitweb" learned to show side-by-side diff. * Fri Jan 27 2012 jpschewe@mtu.net - Added the ability to specify the user and group that git-daemon run as (bnc#742661). * Wed Jan 11 2012 idonmez@suse.com - Update to v1.7.8.3 * Attempt to fetch from an empty file pretending it to be a bundle did not error out correctly. * gitweb did not correctly fall back to configured $fallback_encoding that is not 'latin1'. * "git clone --depth $n" did not catch a non-number given as $n as an error. * Porcelain commands like "git reset" did not distinguish deletions and type-changes from ordinary modification, and reported them with the same 'M' moniker. They now use 'D' (for deletion) and 'T' (for type-change) to match "git status -s" and "git diff --name-status". * You could make "git commit" segfault by giving the "--no-message" option. * "git checkout -m" did not recreate the conflicted state in a "both sides added, without any common ancestor version" conflict situation. * git native connection going over TCP (not over SSH) did not set SO_KEEPALIVE option which failed to receive link layer errors. * "fast-import" did not correctly update an existing notes tree, possibly corrupting the fan-out. * "git log --follow" did not honor the rename threshold score given with the -M option (e.g. "-M50%%"). * Authenticated "git push" over dumb HTTP were broken with a recent change and failed without asking for password when username is given. * "git push" to an empty repository over HTTP were broken with a recent change to the ref handling. * "git push -v" forgot how to be verbose by mistake. It now properly becomes verbose when asked to. * When a "reword" action in "git rebase -i" failed to run "commit --amend", we did not give the control back to the user to resolve the situation, and instead kept the original commit log message. * "git apply --check" did not error out when given an empty input without any patch. * "git archive" mistakenly allowed remote clients to ask for commits that are not at the tip of any ref. * "git checkout" and "git merge" treated in-tree .gitignore and exclude file in $GIT_DIR/info/ directory inconsistently when deciding which untracked files are ignored and expendable. * The function header pattern for files with "diff=cpp" attribute did not consider "type *funcname(type param1,..." as the beginning of a function. * The error message from "git diff" and "git status" when they fail to inspect changes in submodules did not report which submodule they had trouble with. * "git pack-objects" avoids creating cyclic dependencies among deltas when seeing a broken packfile that records the same object in both the deflated form and as a delta. * Tue Dec 13 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: <path>" 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.<name>.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/<name>/ 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 ":/<pattern>" 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 2011 tiwai@suse.de - update to git 1.7.7.3: minor bug-fix release; See Documentation/RelNotes/1.7.7.3.txt for details. * Thu Nov 3 2011 tiwai@suse.de - update to git 1.7.7.1: - update to git 1.7.7.2: bug-fix releases; See Documentation/RelNotes/1.7.7.1.txt and Documentation/RelNotes/1.7.7.2.txt for details. * Mon Oct 17 2011 cfarrell@suse.com - license update: GPL-2.0 SPDX format (See http://www.spdx.org/licenses) * Mon Oct 17 2011 tiwai@suse.de - correct license tag to "GPL v2 only" (bnc#724499) * Fri Oct 14 2011 tiwai@suse.de - split cgit builds to an individual repo * Tue Oct 4 2011 tiwai@suse.de - updated to 1.7.7: major update from 1.7.6.x, including i18n/l10n prepartion, updates of git-p4, gitweb, improved coloring, various updates of git-am, git-bisect, git-cherck-attr, etc. See Documentation/RelNotes/1.7.7.txt for details. * Mon Sep 26 2011 tiwai@suse.de - updated to 1.7.6.4: minor bug fixes for git-am, git-branch, git-clone, etc See Documentation/RelNotes/1.7.6.4.txt for details. * Wed Sep 21 2011 tiwai@suse.de - updated to 1.7.6.2, 1.7.6.3: minor bug fix releases git-fetch performance fix, other fixes in git-reflog, reset, status, tag See Documentation/RelNotes/1.7.6.[23].txt for details. * Thu Aug 25 2011 tiwai@suse.de - updated to 1.7.6.1: bug fix release; many fixes for e.g. git checkout, git diff, git fetch, etc. See Documentation/RelNotes/1.7.6.1.txt for details. * Wed Jun 29 2011 tiwai@suse.de - Add SuSEfirewall profile for git-daemon (bnc#628048) * Mon Jun 27 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 2011 tiwai@suse.de - fix html path (bnc#675392) * Fri Jun 17 2011 tiwai@suse.de - Fix VUL-1: git-web xss (CVE-2011-2186, bnc#698456) * Mon Jun 6 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 2011 tiwai@suse.de - updated to 1.7.5.x: maintenance update release, see Documentation/RelNotes/1.7.5.3.txt Documentation/RelNotes/1.7.5.2.txt Documentation/RelNotes/1.7.5.1.txt - updated to 1.7.5: major version update * Various vcs-svn, git-svn and gitk enhancements and fixes. * Various git-gui updates (0.14.0). * Improved bash completion script * "git repo-config" is officially deprecated * "git checkout" performed on detached HEAD gives a warning * "git cherry-pick" and "git revert" can have a custom merge strategy * "git cherry-pick" remembers which commit failed to apply when it is stopped by conflicts * "git cvsimport" bails out immediately when cvs server is unreachable * "git fetch" vs "git upload-pack" transfer learned 'no-done' protocol extension * "git fetch" can be told to recursively fetch submodules on-demand * "git grep -f <filename>" learned to treat "-" * "git init" learned the --separate-git-dir option * "git log" type commands now understand globbing pathspecs * "git log" family of commands learned --cherry and --cherry-mark options * "git mergetool" learned how to drive "beyond compare 3" as well * "git rerere forget" semantic changes * "git push" with no parameters gives better advice messages * a new "git rerere" subcommand "remaining" See more details in Documentation/RelNotes/1.7.5.txt * Mon Mar 28 2011 tiwai@suse.de - updated to 1.7.4.2: * documentation updates, small bug fixes; see included Documentation/RelNotes/1.7.4.2.txt * Thu Feb 24 2011 dmueller@suse.de - update to 1.7.4.1: * major version update, see included Documentation/RelNotes/1.7.4.txt * Tue Feb 15 2011 chris@computersalat.de - mod apache config o remove ending "/" from alias (Alias /git "/usr/share/gitweb/") * Fri Dec 17 2010 tiwai@suse.de - updated to git 1.7.3.3: In addition to the usual fixes, this release also includes support for the new "add.ignoreErrors" name given to the existing "add.ignore-errors" configuration variable. - updated to git 1.7.3.4: Among many fixes since v1.7.3.3, it contains a fix to a recently discovered XSS vulnerability in Gitweb (CVE 2010-3906) * Mon Dec 13 2010 coolo@novell.com - fix file list for perl module on factory * Wed Dec 1 2010 dmueller@suse.de - update to git 1.7.3.2: This is primarily to push out many documentation fixes accumulated since the 1.7.3.1 release. * Thu Sep 30 2010 tiwai@suse.de - updated to git 1.7.3: major version update; new options and behavior for git-rebase, git-clean, git-checkout, git-gui. See release note: http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.3.txt - updated to git 1.7.3.1: fix git-stash breakages - Set NO_CROSS_DIRECTORY_HARDLINKS=1 to satisfy BS * Fri Aug 20 2010 tiwai@suse.de - updated to git 1.7.2.2: This is primarily for fixing a hanging bug in the smart http transport, but also comes with a lot of documentation udpates. See release note: http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.2.2.txt * Thu Jul 29 2010 tiwai@suse.de - updated to git 1.7.2.1: minor fixes for git-instaweb, git-web, git-config. See release note: http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.2.1.txt * Thu Jul 22 2010 tiwai@suse.de - updated to git 1.7.2: mostly bug fixes and small enhancements; see the release note: http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.2.txt - gitweb stuff is moved to /usr/share/gitweb * Tue Jun 1 2010 pbaudis@suse.cz - Fix the git.xinetd to be disabled by default and the --base-path setting [bnc#495060, bnc#461726] - Fix missing dependencies of git send-email [bnc#561690] - Fix spurious perl-Error provides [bnc#578273] - Drop global $COMP_WORDBREAKS change from bash-completion [bnc#446506] * Tue May 18 2010 chris@computersalat.de - install missing gitweb.js * Mon Apr 26 2010 tiwai@suse.de - updated to git 1.7.1: including fixes in previous 1.7.0.x releases, a few new behavior changes; see the release note: http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.1.txt * Thu Apr 8 2010 dmueller@suse.de - require the correct perl-base version * Thu Apr 1 2010 tiwai@suse.de - updated to git 1.7.0.4: minor fixes http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.0.4.txt * Mon Mar 22 2010 tiwai@suse.de - updated to git 1.7.0.3: just minor fixes http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.0.3.txt * Mon Mar 8 2010 tiwai@suse.de - updated to git 1.7.0.2: http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.0.2.txt * Mon Mar 1 2010 tiwai@suse.de - updated to git 1.7.0.1; just a minor update http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.0.1.txt * Thu Feb 25 2010 tiwai@suse.de - don't use %%py_requires macro, otherwise it add an implicit dependency to git.rpm * Sat Feb 20 2010 jengelh@medozas.de - use %%_smp_mflags, use %%_libexecdir for gitexecdir * Wed Feb 17 2010 tiwai@suse.de - fix installation of python stuff * Mon Feb 15 2010 tiwai@suse.de - updated to version 1.7.0: Major update See details in http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.0.txt Notes on behaviour change: * "git push" into a branch that is currently checked out (i.e. pointed at by HEAD in a repository that is not bare) is refused by default. * "git send-email" does not make deep threads by default when sending a patch series with more than two messages. All messages will be sent as a reply to the first message, i.e. cover letter. * "git status" is not "git commit --dry-run" anymore. This change does not affect you if you run the command without argument. * "git diff" traditionally treated various "ignore whitespace" options only as a way to filter the patch output. "git diff --exit-code -b" exited with non-zero status even if all changes were about changing the amount of whitespace and nothing else; and "git diff -b" showed the "diff --git" header line for such a change without patch text. * External diff and textconv helpers are now executed using the shell. This makes them consistent with other programs executed by git, and allows you to pass command-line parameters to the helpers. Any helper paths containing spaces or other metacharacters now need to be shell-quoted. The affected helpers are GIT_EXTERNAL_DIFF in the environment, and diff.*.command and diff.*.textconv in the config file. * The --max-pack-size argument to 'git repack', 'git pack-objects', and 'git fast-import' was assuming the provided size to be expressed in MiB, unlike the corresponding config variable and other similar options accepting a size value. It is now expecting a size expressed in bytes, with a possible unit suffix of 'k', 'm', or 'g'. - added git-remote-helpers sub-package for python helpers * Thu Jan 21 2010 tiwai@suse.de - updated to version 1.6.6: * "git fsck" defaults to "git fsck --full" and will take longer * check "Preparing yourselves for compatibility issues in 1.7.0" section below for the future update http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.6.txt - updated to version 1.6.6.1; minor bug fixes http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.6.1.txt * Fri Dec 18 2009 tiwai@suse.de - updated to version 1.6.5.7; minor bug fixes http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.5.6.txt http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.5.7.txt * Tue Dec 8 2009 tiwai@suse.de - updated to version 1.6.5.5; only bug fixes; see release notes below; http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.5.4.txt http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.5.5.txt * Tue Nov 17 2009 tiwai@suse.de - updated to version 1.6.5.3; see release notes: http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.5.txt http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.5.1.txt http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.5.2.txt http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.5.3.txt * Fri Oct 23 2009 opensuse@sukimashita.com - fix build of git-http-push enabling webdav push (bnc#504569) * Fri Oct 2 2009 lnussel@suse.de - fix apparmor profile for gitweb * Tue Sep 29 2009 tiwai@suse.de - remove git-arch from Recommends of git package; it's totally optional now - remove tla from Requires of git-arch to avoid dependency errors * Mon Aug 31 2009 tiwai@suse.de - updated to version 1.6.4.2: * rounding fix for --date=relative output between 1 and 5 years * regression fix of "git add -p" to handleexec bits changes * fix "git apply" to honor GNU diff's convention to mark the creation/deletion event with UNIX epoch timestamp * fix "git checkout" to removed files correctly with symlinks * make "git clean -d -f" safer for separate git repos * fix bugs in "git fetch/push" over http transports * fix "git format-patch --cover-letter" with non-ASCII strings * See details in http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.4.2.txt * Mon Aug 24 2009 tiwai@suse.de - updated to version 1.6.4: git push into the currently checked-out branch will be refused by default. See details in http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.4.txt - updated to version 1.6.4.1: Bug fix release. See details in http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.4.1.txt * Mon Jun 22 2009 tiwai@suse.de - updated to 1.6.3.3: * fix "git daemon" to correctly parse the initial line * fix "git diff --textconv" memory leak * improved the built-in regular expressions * fix import-tars script (in contrib) to import symbolic links * fix http.c to use correct CURLOPT_SSLKEY * fix low-level filelevel merge driver * fix "git rebase -i" left stray closing parenthesis in reflog * fix "git remote show" to show all the URLs associated with named remotes * fix "whitespace" attribute handling * Fri Jun 5 2009 tiwai@suse.de - updated to 1.6.3.1: * fix regression of "git checkout -b new-branch" - updated to 1.6.3.2: * fixes for gcc4.4 builds and others. See below for details http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.3.2.txt * Fri May 8 2009 tiwai@suse.de - updated to 1.6.3: * major version update: git push behavior change, With the next major release, "git push" into a branch that is currently checked out will be refused by default. You can choose what should happen upon such a push by setting the configuration * Detailed changelog found at http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.3.txt * Mon Apr 20 2009 tiwai@suse.de - updated to 1.6.2.4: * The configuration parser had a buffer overflow while parsing an overlong value. * pruning reflog entries that are unreachable from the tip of the ref during "git reflog prune" (hence "git gc") was very inefficient. * "git-add -p" lacked a way to say "q"uit to refuse staging any hunks for the remaining paths. You had to say "d" and then ^C. * "git-checkout <tree-ish> <submodule>" did not update the index entry at the named path; it now does. * "git-fast-export" choked when seeing a tag that does not point at commit. * "git init" segfaulted when given an overlong template location via the --template= option. * "git-ls-tree" and "git-diff-tree" used a pathspec correctly when deciding to descend into a subdirectory but they did not match the individual paths correctly. This caused pathspecs "abc/d ab" to match "abc/0" ("abc/d" made them decide to descend into the directory "abc/", and then "ab" incorrectly matched "abc/0" when it shouldn't). * "git-merge-recursive" was broken when a submodule entry was involved in a criss-cross merge situation. * Thu Apr 16 2009 tiwai@suse.de - updated to 1.6.2.2: * A longstanding confusing description of what --pickaxe option of git-diff does has been clarified in the documentation. * "git-blame -S" did not quite work near the commits that were given on the command line correctly. * "git diff --pickaxe-regexp" did not count overlapping matches correctly. * "git diff" did not feed files in work-tree representation to external diff and textconv. * "git-fetch" in a repository that was not cloned from anywhere said it cannot find 'origin', which was hard to understand for new people. * "git-format-patch --numbered-files --stdout" did not have to die of incompatible options; it now simply ignores - -numbered-files as no files are produced anyway. * "git-ls-files --deleted" did not work well with GIT_DIR&GIT_WORK_TREE. * "git-read-tree A B C..." without -m option has been broken for a long time. * git-send-email ignored --in-reply-to when --no-thread was given. * 'git-submodule add' did not tolerate extra slashes and ./ in the path it accepted from the command line; it now is more lenient. * git-svn misbehaved when the project contained a path that began with two dashes. * import-zips script (in contrib) did not compute the common directory prefix correctly. * miscompilation of negated enum constants by old gcc (2.9) affected the codepaths to spawn subprocesses. - updated to 1.6.2.3: * Setting an octal mode value to core.sharedrepository configuration to restrict access to the repository to group members did not work as advertised. * A fairly large and trivial memory leak while rev-list shows list of reachable objects has been identified and plugged. * "git-commit --interactive" did not abort when underlying "git-add -i" signaled a failure. * git-repack (invoked from git-gc) did not work as nicely as it should in a repository that borrows objects from neighbours via alternates mechanism especially when some packs are marked with the ".keep" flag to prevent them from being repacked. - fix the start-check in git-daemon script (bnc#494824) * Mon Mar 16 2009 tiwai@suse.de - updated to 1.6.2.1: * .gitignore learned to handle backslash as a quoting mechanism for comment introduction character "#". * timestamp output in --date=relative mode used to display timestamps that are long time ago in the default mode * git-add -i/-p now works with non-ASCII pathnames. * "git hash-object -w" did not read from the configuration file from the correct .git directory. * git-send-email learned to correctly handle multiple Cc: addresses. * Thu Mar 5 2009 tiwai@suse.de - updated to 1.6.2: * @{-1} is a way to refer to the last branch you were on. * The location of .mailmap file can be configured * Improvements on "git add -p" * Improvements on "git am" behavior and options * "git blame" aligns author names better * "git clone" now makes its best effort when cloning from an empty repository * "git checkout -" is a shorthand for "git checkout @{-1}". * "git cherry" defaults to whatever the current branch is tracking (if exists) when the <upstream> argument is not given. * "git cvsserver" fixes / improvements * New options for "git diff" * New options for "git filter-branch" * "git fsck" now checks loose objects in alternate object stores * "git gc --prune" was resurrected to allow "git gc --no-prune" * New option for "git mergetool" * "git rebase -i" can transplant a history down to root * "git reset --merge" option * "git submodule update" learned --no-fetch option. * "git tag" learned --contains For more details, see http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.2.txt * Mon Feb 9 2009 tiwai@suse.de - updated to 1.6.1.3: * "git diff --binary | git apply" pipeline did not work well when a binary blob is changed to a symbolic link. * some combinations of -b/-w/--ignore-space-at-eol to "git diff" did not work as expected. * "git grep" did not pass the -I (ignore binary) option when calling out an external grep program. * "git log" and friends include HEAD to the set of starting points when --all is given. This makes a difference when you are not on any branch. * "git mv" to move an untracked file to overwrite a tracked contents misbehaved. * "git merge -s octopus" with many potential merge bases did not work correctly. * RPM binary package installed the html manpages in a wrong place. Also includes minor documentation fixes and updates. * Thu Jan 29 2009 schwab@suse.de - Formatting fix for manual pages. * Thu Jan 29 2009 tiwai@suse.de - updated to 1.6.1.2: * The logic for rename detectin in internal diff used by commands like "git diff" and "git blame" have been optimized to avoid loading the same blob repeatedly. * We did not allow writing out a blob that is larger than 2GB for no good reason. * "git format-patch -o $dir", when $dir is a relative directory, used it as relative to the root of the work tree, not relative to the current directory. * v1.6.1 introduced an optimization for "git push" into a repository (A) that borrows its objects from another repository (B) to avoid sending objects that are available in repository B, when they are not yet used by repository A. However the code on the "git push" sender side was buggy and did not work when repository B had new objects that are not known by the sender. This caused pushing into a "forked" repository served by v1.6.1 software using "git push" from v1.6.1 sometimes did not work. The bug was purely on the "git push" sender side, and has been corrected. * "git status -v" did not paint its diff output in colour even when color.ui configuration was set. * "git ls-tree" learned --full-tree option to help Porcelain scripts that want to always see the full path regardless of the current working directory. * "git grep" incorrectly searched in work tree paths even when they are marked as assume-unchanged. It now searches in the index entries. * "git gc" with no grace period needlessly ejected packed but unreachable objects in their loose form, only to delete them right away. * Mon Jan 26 2009 tiwai@suse.de - updated to 1.6.1.1: * "git add frotz/nitfol" when "frotz" is a submodule should have errored out, but it didn't. * "git apply" took file modes from the patch text and updated the mode bits of the target tree even when the patch was not about mode changes. * "git bisect view" on Cygwin did not launch gitk * "git checkout $tree" did not trigger an error. * "git commit" tried to remove COMMIT_EDITMSG from the work tree by mistake. * "git describe --all" complained when a commit is described with a tag, which was nonsense. * "git diff --no-index --" did not trigger no-index (aka "use git-diff as a replacement of diff on untracked files") behaviour. * "git format-patch -1 HEAD" on a root commit failed to produce patch text. * "git fsck branch" did not work as advertised; instead it behaved the same way as "git fsck". * "git log --pretty=format:%%s" did not handle a multi-line subject the same way as built-in log listers (i.e. shortlog, - -pretty=oneline, etc.) * "git daemon", and "git merge-file" are more careful when freopen fails and barf, instead of going on and writing to unopened filehandle. * "git http-push" did not like some RFC 4918 compliant DAV server responses. * "git merge -s recursive" mistakenly overwritten an untracked file in the work tree upon delete/modify conflict. * "git merge -s recursive" didn't leave the index unmerged for entries with rename/delete conflictd. * "git merge -s recursive" clobbered untracked files in the work tree. * "git mv -k" with more than one errorneous paths misbehaved. * "git read-tree -m -u" hence branch switching incorrectly lost a subdirectory in rare cases. * "git rebase -i" issued an unnecessary error message upon a user error of marking the first commit to be "squash"ed. * "git shortlog" did not format a commit message with multi-line subject correctly. * Thu Jan 8 2009 tiwai@suse.de - updated to 1.6.1: * handle properly the exit code when pager is used * various git-gui updates including translations * gitweb updates * many other improvements / fixes. See release notes http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.1.txt * Fri Dec 19 2008 lnussel@suse.de - add apparmor profile for git-web - don't use %%jobs for generating docu - change gitexecdir to /usr/lib instead of %%_libdir * Wed Dec 17 2008 tiwai@suse.de - Fix VUL-0 Possible gitweb vulnerability: calling "git diff" [bnc#459664] * Thu Dec 11 2008 pbaudis@suse.cz - Fix the git.xinetd daemon call [bnc#450508] * Wed Nov 19 2008 tiwai@suse.de - install git-shell and git-cvsserver as in the upstream (bnc#446049) * Tue Nov 4 2008 olh@suse.de - use fdupes only if the distribution provides it - use libopenssl-devel only if the distribution provides it * Fri Oct 24 2008 tiwai@suse.de - fix git.xinetd not to run the old git-daemon (bnc#438715) * Mon Oct 6 2008 tiwai@suse.de - fix git-daemon init script to start (bnc#432610) * Fri Sep 26 2008 schwab@suse.de - Fix manual pages. * Thu Sep 25 2008 tiwai@suse.de - updated to 1.6.0.2: Mostly small bug fixes, see details in http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.0.2.txt * Thu Sep 25 2008 tiwai@suse.de - fix file selections of git-core package - use symlinks for git sub-commands instead of hardlinks to make build system happy * Tue Sep 9 2008 tiwai@suse.de - updated to 1.6.0: * http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.0.txt - updated to 1.6.0.1: * http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.6.0.1.txt - install git subcommands now to libdir/git users have to set up properly if they want to keep the old style (refer git --execpath) * Tue Sep 9 2008 lnussel@suse.de - split off gui and web subpackages * Mon Aug 18 2008 schwab@suse.de - Fix name of completions file. * Tue Aug 12 2008 tiwai@suse.de - updated to 1.5.6.5: * http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.6.5.txt * http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.6.4.txt * http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.6.3.txt * http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.6.2.txt * http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.6.1.txt * Wed Aug 6 2008 anosek@suse.cz - fixed Add git xinetd.d file for ability to use yast2 (bnc#398361) - created file git.xinetd to run git under xinetd daemon * Tue Jun 24 2008 dmueller@suse.de - update to 1.5.6: * http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.6.txt * Mon Jun 16 2008 lnussel@suse.de - use separate package for git-daemon (bnc#382710) - add user and install init script for git-daemon * Tue May 20 2008 lnussel@suse.de - install gitweb icons, style sheet and README (bnc#359882) - build using V=1 so use of cflags can be verified by brp scripts - fix build using --without docs * Mon Apr 7 2008 dmueller@suse.de - update to 1.5.4.5: * http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.4.5.txt * Tue Mar 18 2008 dmueller@suse.de - update to 1.5.4.4: * git svnimport was removed in favor of git svn * git runstatus has been removed * changes are available under http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.4.txt http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.4.1.txt http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.4.2.txt http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.4.3.txt http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.5.4.4.txt * Mon Jan 28 2008 mmarek@suse.de - added libopenssl-devel to BuildRequires to fix build * Tue Jan 8 2008 schwab@suse.de - Update to version 1.5.3.8. * Some documentation used "email.com" as an example domain. * git-svn fix to handle funky branch and project names going over http/https correctly. * git-svn fix to tone down a needlessly alarming warning message. * git-clone did not correctly report errors while fetching over http. * git-send-email added redundant Message-Id: header to the outgoing e-mail when the patch text already had one. * a read-beyond-end-of-buffer bug in configuration file updater was fixed. * git-grep used to show the same hit repeatedly for unmerged paths. * After amending the patch title in "git-am -i", the command did not report the patch it applied with the updated title. * Tue Jan 8 2008 crrodriguez@suse.de - git-cvsserver was unusable, it produced a perl failed-compilation error due to missing dependency on perl-DBD-Sqlite. - update to version 1.5.3.7 * git-send-email added 8-bit contents to the payload without marking it as 8-bit in a CTE header. * "git-bundle create a.bndl HEAD" dereferenced the symref and did not record the ref as 'HEAD'; this prevented a bundle from being used as a normal source of git-clone. * The code to reject nonsense command line of the form "git-commit -a paths..." and "git-commit --interactive paths..." were broken. * Adding a signature that is not ASCII-only to an original commit that is ASCII-only would make the result non-ASCII. "git-format-patch -s" did not mark such a message correctly with MIME encoding header. * git-add sometimes did not mark the resulting index entry stat-clean. This affected only cases when adding the contents with the same length as the previously staged contents, and the previous staging made the index entry "racily clean". * git-commit did not honor GIT_INDEX_FILE the user had in the environment. * When checking out a revision, git-checkout did not report where the updated HEAD is if you happened to have a file called HEAD in the work tree. * "git-rev-list --objects" mishandled a tree that points at a submodule. * "git cvsimport" was not ready for packed refs that "git gc" can produce and gave incorrect results. * Many scripted Porcelains were confused when you happened to have a file called "HEAD" in your work tree. * Wed Nov 28 2007 dmueller@suse.de - update to 1.5.3.6: * various smaller bugfixes - remove requires on release (#305826) - install bash completion (#336848) * Tue Oct 9 2007 dmueller@suse.de - update to 1.5.3.4: * submodule support * many new features and bugfixes * Mon Aug 6 2007 dmueller@suse.de - update to 1.5.2.4: * "git checkout" failed to switch back and forth between branches, one of which has "frotz -> xyzzy" symlink and file "xyzzy/filfre", while the other one has a file "frotz/filfre". * "git prune" used to segfault upon seeing a commit that is referred to by a tree object (aka "subproject"). * "git diff --name-status --no-index" mishandled an added file. * "git apply --reverse --whitespace=warn" still complained about whitespaces that a forward application would have introduced. * Thu Jul 5 2007 dmueller@suse.de - Update to 1.5.2.3: * fix many segfaults with the SVN gateway * various bugfixes * Thu May 17 2007 dmueller@suse.de - Update to 1.5.1.4: * GIT <-> SVN gateway * New porcelain, much improved index handling * git-config * Bare repositories refuse commands that need a working tree * packed ref support * 3-way merges can be done without rcs * python dependency dropped * Sat Nov 18 2006 pbaudis@suse.cz - Fix build failure from previous change (trivial omission) * Fri Nov 17 2006 pbaudis@suse.cz - Fix git-arch package containing git-archive and git-upload-archive [#222074] * Fri Nov 17 2006 pbaudis@suse.cz - Upgrade to git-1.4.3.4 - only few bugfixes, most importantly git-apply wouldn't apply creation/deletion patches * Tue Nov 7 2006 ro@suse.de - fix permissions for manpages * Sat Oct 28 2006 meissner@suse.de - use RPM_OPT_FLAGS also in %%install make * Thu Oct 26 2006 pbaudis@suse.cz - Upgrade to git-1.4.3.3 - bugfixes release * Thu Oct 19 2006 pbaudis@suse.cz - Update to git-1.4.3 - UI improvements, speedups, random new features (e.g. git-daemon name-based virtual hosting support), basic Git.pm - Fixes build failures due to asciidoc incompatibilities * Tue Jul 25 2006 pbaudis@suse.cz - Update to git-1.4.1.1 - includes gitweb, many bugfixes, some commands are converted from shell to C, aliasing support, documentation improvements and so on. - Junio's patch got applied upstream. - Pre-create /srv/git for bare Git repositories hosting. - Install gitweb to /srv/www/cgi-bin pre-configured to look for packages at /srv/git. * Sun May 14 2006 pbaudis@suse.cz - Update to git-core-1.3.1 - git-cvsserver pserver interface, .git/refs/remotes branches support, blame/annotate tools, builtin diff, faster and better rename detection and number of other stuff. - Add Junio's patch for saner handling of symlink refs. This is an important bugfix since without this, it is impossible to bisect behind kernel linux-v2.6.15-g117a93d. - Olaf Hering's cutnpaste patch got applied upstream. * Mon Mar 13 2006 ro@suse.de - change requires from "openssh-clients" to "openssh" (former does not exist) * Fri Mar 10 2006 pbaudis@suse.cz - Add Olaf Hering's patch for easier cut'n'pasting. * Tue Mar 7 2006 pbaudis@suse.cz - Update to git-core 1.2.4. - This is a security fix: there was a buffer overflow when checking out a tree with an insanely long symlink. (No Bugzilla id.) * Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires * Tue Jan 17 2006 pbaudis@suse.cz - Fix the specfile build (no expat and asciidoc, xmlto problems) * Mon Jan 16 2006 pbaudis@suse.cz - Update to git-core 1.1.3. - Modify the specfile so that it looks more like the stock one. - Split bits to subpackages * Sun Dec 4 2005 schwab@suse.de - Fix embedded paths. * Wed Oct 5 2005 schwab@suse.de - Don't build documentation in parallel. * Mon Sep 19 2005 schwab@suse.de - Update to git-core 0.99.7. - Install manpages. * Fri Aug 5 2005 kasievers@suse.de - New version 0.99.3git20050905 rename git to git-core, to match the upstream package name * Sun Jul 3 2005 kasievers@suse.de - New version 0.7git20050703 * Thu Jun 30 2005 kasievers@suse.de - New version 20050630 * Fri Jun 24 2005 kasievers@suse.de - New version 20050624 * Sun Jun 12 2005 kay.sievers@suse.de - New version 20050612 * Thu Jun 2 2005 kay.sievers@suse.de - Split git/Cogito into separate packages - Update git to version 20050602 * Fri May 20 2005 schwab@suse.de - Use RPM_OPT_FLAGS. - Specfile cleanup. * Fri May 20 2005 mmj@suse.de - %%_libdir -> FHS libexec * Fri May 20 2005 skh@suse.de - initial package
