Dear release managers, dear Gerrit, Some quick changes for git in squeeze.
- Trivial fixes from upstream: memory leaks in cache_tree_free and diff; confusing use of static buffer in setup_git_env; dependence on signed int overflow semantics. - Documentation formatting fixes (mostly stray backslashes in manpages) to fix bugs #540001, #600422. - Weaker dependencies for gitweb, so it can be used with nginx without installing another webserver to satisfy dpkg. Fixes bug #600413 (which is a regression from lenny and is probably "serious"; sorry for the mislabeling). See [1] for the diff, [2] for the resulting tree. It is well tested. diffstat for the upstream part: Documentation/asciidoc.conf | 2 ++ Documentation/config.txt | 9 +++++---- Documentation/git-add.txt | 4 ++-- Documentation/git-bisect-lk2009.txt | 2 +- Documentation/git-bundle.txt | 8 ++++---- Documentation/git-checkout-index.txt | 2 +- Documentation/git-checkout.txt | 2 +- Documentation/git-commit-tree.txt | 2 +- Documentation/git-fast-export.txt | 2 +- Documentation/git-for-each-ref.txt | 2 +- Documentation/git-grep.txt | 4 ++-- Documentation/git-ls-files.txt | 6 +++--- Documentation/git-merge-index.txt | 2 +- Documentation/git-push.txt | 2 +- Documentation/git-rebase.txt | 2 +- Documentation/git-relink.txt | 2 +- Documentation/git-rev-parse.txt | 9 +++++---- Documentation/git-rm.txt | 9 +++++---- Documentation/git-show-branch.txt | 8 ++++---- Documentation/git-show-ref.txt | 4 ++-- Documentation/git-update-index.txt | 4 ++-- Documentation/gitcore-tutorial.txt | 18 +++++++++--------- Documentation/gitignore.txt | 4 ++-- Documentation/rev-list-options.txt | 2 +- Documentation/technical/api-parse-options.txt | 8 ++++---- Documentation/user-manual.txt | 4 ++-- cache-tree.c | 4 +++- diff.c | 5 ++++- gitweb/gitweb.perl | 8 ++++---- 29 files changed, 75 insertions(+), 65 deletions(-) and for the changes outside debian/diff: debian/changelog | 4 ++++ debian/control | 11 +++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) Less urgent changes[3] not included, though should could be included if you want them. - Tweak the git-core package description to avoid disappointing sysadmins that would like to remove it - Let emacs support take effect with emacs23. Not a technical regression since emacs22 still works, but a practical one. Unfortunately, the elisp produces some warnings; it would be nice to find someone familiar with emacs to work on this. - Steer admins towards the very nice cvs2git utility (package cvs2svn) in the git-cvs package description. - Fix password prompting in git gui (not a regression from lenny but a new feature, bug #588103). - git apply: Accept traditional patches patching files with space in name. Requested in bug #578752. - Modify "git reset --hard" to work correctly when using the new sparse checkout feature (bug #583699). - Add a !doctype declaration to the user manual (bug #507476). - gitk: Use standard desktop fonts (bug #466471). - gitk: Avoid spurious matches for numbers in "All fields" search (bug #465776). - Fix test suite when run as root (bug #524309). - merge: Allow custom strategies to intervene in trivial merges (bug #581691). Thoughts? Jonathan [1] http://repo.or.cz/w/debian-git/jrn.git/patch/for-squeeze?hp=debian-sid [2] git://repo.or.cz/debian-git/jrn.git for-squeeze [3] git://repo.or.cz/debian-git/jrn.git proposed-updates -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/20101114231210.ga31...@burratino
