Commits

Show all
Author Commit Message Labels Comments Date
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
builtin-apply.c: do not set bogus mode in check_preimage() for deleted path If it is deleted, it is deleted. Do not set the current mode to it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
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
Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-metainfo This is an evil merge, as a test added since 1.6.0 expects an incorrect behaviour the merged commit fixes. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
diff.c: output correct index lines for a split diff A patch that changes the filetype (e.g. regular file to symlink) of a path must be split into a deletion event followed by a creation event, which means that we need to have two independent metainfo lines for each. However, the code reused the single set of metainfo lines. As the blob object names recorded on the index lines are usually not used nor validated on the receiving end, this is not an …
Anders Melchiorsen
Documentation: rework src/dst description in git push This tries to make the description of ref matching in git push easier to read. Beauty is in the eye of the beholder, though. Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Anders Melchiorsen
Documentation: more git push examples Include examples of using HEAD. The order of examples introduces new concepts one by one. This pushes the example of deleting a ref to the end of the list. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Documentation: simplify refspec format description The refspec format description was a mix of regexp and BNF, making it very difficult to read. The format was also wrong: it did not show that each part of a refspec is optional in different situations. Rather than having a confusing grammar, just present the format in informal prose. Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk> 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>
Tags
v1.6.1.1
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…
Keith Cascio
Fix combined use of whitespace ignore options to diff The code used to misbehave when options to ignore certain whitespaces (-w -b and --ignore-at-eol) were combined. Signed-off-by: Keith Cascio <keith@cs.ucla.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Keith Cascio
test more combinations of ignore-whitespace options to diff There are three flags involved (-w -b and --ignore-space-at-eol) which makes 8 combinations possible in total, but only 3 cases are tested (none, -w alone and -b alone). This adds the other 5 cases. Signed-off-by: Keith Cascio <keith@cs.ucla.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
  1. Prev
  2. Next