Package: git-core
Version: 1:1.6.6.1-1
Severity: serious
Tags: patch
Hi Gerrit,
The new point release fixes some simple buffer overflows among other
things so I packaged it. Perhaps the result could save you some effort.
The following changes since commit 0fd8588401415a5056e24acaea0344bb448ae7b4:
* debian/gitweb.conffiles: add /etc/apache2/conf.d/gitweb. (2010-01-27)
are available in the git repository at:
git://repo.or.cz/debian-git/jrn.git sid
Christopher Beelby (1):
git-gui: Keep repo_config(gui.recentrepos) and .gitconfig in sync
Gerrit Pape (1):
git-cvsserver: allow regex metacharacters in CVSROOT
Giuseppe Bilotta (1):
git-gui: work from the .git dir
Ilari Liusvaara (4):
Add xmallocz()
Fix integer overflow in patch_delta()
Fix integer overflow in unpack_sha1_rest()
Fix integer overflow in unpack_compressed_entry()
Jay Soffian (1):
blame: prevent a segv when -L given start > EOF
Jeff Epler (1):
git-gui: Fix applying a line when all following lines are deletions
Jeff King (1):
fix memcpy of overlapping area
Jens Lehmann (1):
git-gui: Correct file_states when unstaging partly staged entry
Johan Herland (1):
builtin-config: Fix crash when using "-f <relative path>" from non-root
dir
Jonathan Nieder (8):
git-gui: Makefile: consolidate .FORCE-* targets
Fill out debian/copyright
Fix references in generated man pages to point to /usr
debian/rules: stop ignoring test suite failures on ia64
Merge branches 'jn/debian-ia64-normalcy' and 'jn/debian-copyright' into
debian-sid
Merge branch 'jn/debian-doc-fix' into debian-sid
Merge commit 'v1.6.6.2' into debian-sid
* new upstream point release.
Junio C Hamano (34):
checkout -m path: fix recreating conflicts
status: don't require the repository to be writable
Fix "log" family not to be too agressive about showing notes
Merge branch 'jc/maint-refresh-index-is-optional-for-status' into maint
Fix "log --oneline" not to show notes
merge-recursive: do not return NULL only to cause segfault
ignore duplicated slashes in make_relative_path()
Merge branch 'maint' of git://git.spearce.org/git-gui into maint
approxidate_careful() reports errorneous date string
Update @{bogus.timestamp} fix not to die()
t0101: use a fixed timestamp when searching in the reflog
Merge branch 'maint-1.6.5' into maint
Merge branch 'bg/maint-add-all-doc' into maint-1.6.5
Merge branch 'sb/maint-octopus' into maint-1.6.5
Merge branch 'jc/maint-limit-note-output' into maint
git-add documentation: Fix shell quoting example
Merge branch 'jc/maint-doc-git-add-example' into maint
Fix parsing of imap.preformattedHTML and imap.sslverify
Merge branch 'jc/maint-imap-config-parse' into maint
git-push: document all the status flags used in the output
Merge branch 'jc/maint-push-doc-status' into maint
Merge branch 'maint-1.6.5' into maint
check-ref-format documentation: fix enumeration mark-up
Merge branch 'rs/maint-archive-match-pathspec' into maint
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' into maint
Merge branch 'nd/include-termios-for-osol' into maint
Merge branch 'jh/maint-config-file-prefix' into maint
Merge branch 'il/maint-xmallocz' into maint
Merge branch 'jc/maint-reflog-bad-timestamp' into maint
Merge branch 'gp/maint-cvsserver' into maint
Merge branch 'sp/maint-fast-import-large-blob' into maint
t8003: check exit code of command and error message separately
Merge branch 'maint-1.6.5' into maint
Git 1.6.6.2
Nguyễn Thái Ngọc Duy (1):
Add missing #include to support TIOCGWINSZ on Solaris
Pat Thoyts (1):
git-gui: handle really long error messages in updateindex.
Peter Krefting (1):
git-gui: Fix gitk for branch whose name matches local file
René Scharfe (2):
archive: complain about path specs that don't match anything
archive: simplify archive format guessing
SZEDER Gábor (1):
bash: don't offer remote transport helpers as subcommands
Shawn O. Pearce (1):
fast-import: Stream very large blobs directly to pack
Tay Ray Chuan (1):
retry request without query when info/refs?query fails
Vitaly _Vi Shukela (1):
git-gui: Add hotkeys for "Unstage from commit" and "Revert changes"
Wesley J. Landaker (1):
Update git fsck --full short description to mention packs
Documentation/RelNotes-1.6.6.2.txt | 46 ++++
Documentation/config.txt | 14 +
Documentation/git-add.txt | 2 +-
Documentation/git-check-ref-format.txt | 2 +-
Documentation/git-fast-import.txt | 6 +
Documentation/git-push.txt | 15 +-
Documentation/git.txt | 3 +-
Documentation/pretty-options.txt | 8 +
GIT-VERSION-GEN | 2 +-
RelNotes | 2 +-
archive.c | 25 ++-
builtin-archive.c | 34 ++--
builtin-blame.c | 2 +-
builtin-checkout.c | 2 +-
builtin-commit.c | 10 +-
builtin-config.c | 2 +-
builtin-fsck.c | 2 +-
builtin-log.c | 3 +
cache.h | 3 +-
commit.c | 2 +-
commit.h | 1 +
contrib/completion/git-completion.bash | 1 +
date.c | 43 +++-
debian/changelog | 21 ++-
debian/changelog.upstream | 82 +++++++
debian/control | 6 +-
debian/copyright | 251 +++++++++++++++++---
...check-etc-mailname-if-author-email-is-unkn.diff | 6 +-
...hooks-post-receive-email-set-encoding-to-u.diff | 6 +-
...rver-allow-regex-metacharacters-in-CVSROOT.diff | 33 ---
debian/rules | 18 +--
debian/versions.upstream | 1 +
fast-import.c | 179 +++++++++++++--
git-compat-util.h | 2 +
git-cvsserver.perl | 2 +-
git-gui/Makefile | 7 +-
git-gui/git-gui.sh | 25 ++-
git-gui/lib/choose_repository.tcl | 4 +
git-gui/lib/diff.tcl | 1 +
git-gui/lib/index.tcl | 34 ++--
imap-send.c | 15 +-
log-tree.c | 1 +
merge-recursive.c | 8 +-
patch-delta.c | 3 +-
path.c | 39 +++-
pretty.c | 2 +-
remote-curl.c | 18 ++-
revision.c | 9 +
revision.h | 3 +
sha1_file.c | 6 +-
sha1_name.c | 5 +-
t/t0101-at-syntax.sh | 45 ++++
t/t1300-repo-config.sh | 11 +
t/t1501-worktree.sh | 6 +
t/t3301-notes.sh | 59 +++++
t/t5000-tar-tree.sh | 10 +
t/t5705-clone-2gb.sh | 2 +-
t/t7201-co.sh | 57 +++++
t/t8003-blame.sh | 10 +
t/t9300-fast-import.sh | 46 ++++
wrapper.c | 15 +-
61 files changed, 1062 insertions(+), 216 deletions(-)
create mode 100644 Documentation/RelNotes-1.6.6.2.txt
delete mode 100644
debian/diff/0003-git-cvsserver-allow-regex-metacharacters-in-CVSROOT.diff
create mode 100755 t/t0101-at-syntax.sh
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
