Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
GIT 1.6.1.2 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jc/maint-format-patch-o-relative' into maint * jc/maint-format-patch-o-relative: Teach format-patch to handle output directory relative to cwd Conflicts: t/t4014-format-patch.sh
Junio C Hamano
Merge branch 'bs/maint-rename-populate-filespec' into maint * bs/maint-rename-populate-filespec: Rename detection: Avoid repeated filespec population
Junio C Hamano
Merge branch 'mh/maint-commit-color-status' into maint * mh/maint-commit-color-status: git-status -v: color diff output when color.ui is set git-commit: color status output when color.ui is set
Junio C Hamano
Merge branch 'nd/grep-assume-unchanged' into maint * nd/grep-assume-unchanged: grep: grep cache entries if they are "assume unchanged" grep: support --no-ext-grep to test builtin grep
Junio C Hamano
Merge branch 'jc/maint-ls-tree' into maint * jc/maint-ls-tree: Document git-ls-tree --full-tree ls-tree: add --full-tree option
Junio C Hamano
Merge branch 'np/no-loosen-prune-expire-now' into maint * np/no-loosen-prune-expire-now: objects to be pruned immediately don't have to be loosened
Junio C Hamano
Merge branch 'mc/cd-p-pwd' into maint * mc/cd-p-pwd: git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on OS X
Junio C Hamano
Merge branch 'maint-1.6.0' into maint * maint-1.6.0: avoid 31-bit truncation in write_loose_object
Jeff King
avoid 31-bit truncation in write_loose_object The size of the content we are adding may be larger than 2.1G (i.e., "git add gigantic-file"). Most of the code-path to do so uses size_t or unsigned long to record the size, but write_loose_object uses a signed int. On platforms where "int" is 32-bits (which includes x86_64 Linux platforms), we end up passing malloc a negative size. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio …
Junio C Hamano
send-pack: do not send unknown object name from ".have" to pack-objects v1.6.1 introduced ".have" extension to the protocol to allow the receiving side to advertise objects that are reachable from refs in the repositories it borrows from. This was meant to be used by the sending side to avoid sending such objects; they are already available through the alternates mechanism. The client side implementation in v1.6.1, which was introduced with 40c155f (push: prepare se…
Junio C Hamano
Merge branch 'maint-1.6.0' into maint * maint-1.6.0: test-path-utils: Fix off by one, found by valgrind get_sha1_basic(): fix invalid memory access, found by valgrind
Johannes Schindelin
test-path-utils: Fix off by one, found by valgrind When normalizing an absolute path, we might have to add a slash _and_ a NUL to the buffer, so the buffer was one too small. Let's just future proof the code and alloc PATH_MAX + 1 bytes. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin
get_sha1_basic(): fix invalid memory access, found by valgrind When get_sha1_basic() is passed a buffer of len 0, it should not check if buf[len-1] is a curly bracket. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
GIT 1.6.1.1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'cb/maint-unpack-trees-absense' into maint * cb/maint-unpack-trees-absense: unpack-trees: remove redundant path search in verify_absent unpack-trees: fix path search bug in verify_absent unpack-trees: handle failure in verify_absent
Junio C Hamano
Merge branch 'tr/maint-no-index-fixes' into maint * tr/maint-no-index-fixes: diff --no-index -q: fix endless loop diff --no-index: test for pager after option parsing diff: accept -- when using --no-index
Junio C Hamano
Merge branch 'rs/maint-shortlog-foldline' into maint * rs/maint-shortlog-foldline: shortlog: handle multi-line subjects like log --pretty=oneline et. al. do
Junio C Hamano
Merge branch 'pj/maint-ldflags' into maint * pj/maint-ldflags: configure clobbers LDFLAGS
Junio C Hamano
Merge branch 'pb/maint-git-pm-false-dir' into maint * pb/maint-git-pm-false-dir: Git.pm: correctly handle directory name that evaluates to "false"
Junio C Hamano
Merge branch 'js/maint-bisect-gitk' into maint * js/maint-bisect-gitk: bisect view: call gitk if Cygwin's SESSIONNAME variable is set
Junio C Hamano
Merge branch 'js/add-not-submodule' into maint * js/add-not-submodule: git add: do not add files from a submodule
Junio C Hamano
Merge branch 'jc/maint-format-patch' into maint * jc/maint-format-patch: format-patch: show patch text for the root commit
Junio C Hamano
Merge branch 'am/maint-push-doc' into maint * am/maint-push-doc: Documentation: avoid using undefined parameters Documentation: mention branches rather than heads Documentation: remove a redundant elaboration Documentation: git push repository can also be a remote
Junio C Hamano
Merge branch 'maint-1.6.0' into maint * maint-1.6.0: Fix Documentation for git-describe
Boyd Smith
Fix Documentation for git-describe The documentation for git-describe says the default abbreviation is 8 hexadecimal digits while cache.c clearly shows DEFAULT_ABBREV set to 7. This patch corrects the documentation. Signed-off-by: Boyd Stephen Smith Jr <bss@iguanasuicide.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin
Rename diff.suppress-blank-empty to diff.suppressBlankEmpty All the other config variables use CamelCase. This config variable should not be an exception. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Björn Steinbrink
Rename detection: Avoid repeated filespec population In diffcore_rename, we assume that the blob contents in the filespec aren't required anymore after estimate_similarity has been called and thus we free it. But estimate_similarity might return early when the file sizes differ too much. In that case, cnt_data is never set and the next call to estimate_similarity will populate the filespec again, eventually rereading the same blob over and over agai…
Lars Noschinski
shell: Document that 'cvs server' is a valid command git-shell's man page explicitly lists all allowed commands, but 'cvs server' was missing. Add it. Signed-off-by: Lars Noschinski <lars@public.noschinski.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Anders Melchiorsen
Documentation: avoid using undefined parameters The <ref> parameter has not been introduced, so rewrite to avoid it. Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
  1. Prev
  2. Next