Permalink
Commits on Jan 29, 2009
  1. GIT 1.6.1.2

    gitster committed Jan 29, 2009
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'jc/maint-format-patch-o-relative' into maint

    gitster committed Jan 29, 2009
    * jc/maint-format-patch-o-relative:
      Teach format-patch to handle output directory relative to cwd
    
    Conflicts:
    	t/t4014-format-patch.sh
  3. Merge branch 'bs/maint-rename-populate-filespec' into maint

    gitster committed Jan 29, 2009
    * bs/maint-rename-populate-filespec:
      Rename detection: Avoid repeated filespec population
  4. Merge branch 'mh/maint-commit-color-status' into maint

    gitster committed Jan 29, 2009
    * 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
  5. Merge branch 'nd/grep-assume-unchanged' into maint

    gitster committed Jan 29, 2009
    * nd/grep-assume-unchanged:
      grep: grep cache entries if they are "assume unchanged"
      grep: support --no-ext-grep to test builtin grep
  6. Merge branch 'jc/maint-ls-tree' into maint

    gitster committed Jan 29, 2009
    * jc/maint-ls-tree:
      Document git-ls-tree --full-tree
      ls-tree: add --full-tree option
  7. Merge branch 'np/no-loosen-prune-expire-now' into maint

    gitster committed Jan 29, 2009
    * np/no-loosen-prune-expire-now:
      objects to be pruned immediately don't have to be loosened
  8. Merge branch 'mc/cd-p-pwd' into maint

    gitster committed Jan 29, 2009
    * mc/cd-p-pwd:
      git-sh-setup: Fix scripts whose PWD is a symlink to a work-dir on OS X
  9. Merge branch 'maint-1.6.0' into maint

    gitster committed Jan 29, 2009
    * maint-1.6.0:
      avoid 31-bit truncation in write_loose_object
  10. avoid 31-bit truncation in write_loose_object

    peff authored and gitster committed Jan 29, 2009
    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 C Hamano <gitster@pobox.com>
Commits on Jan 28, 2009
  1. send-pack: do not send unknown object name from ".have" to pack-objects

    gitster committed Jan 28, 2009
    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 sender to receive extended ref information from the
    receiver, 2008-09-09) aka v1.6.1-rc1~203^2~1, were faulty in that it did
    not consider the possiblity that the repository receiver borrows from
    might have objects it does not know about.
    
    This fixes it by refraining from passing missing commits to underlying
    pack-objects.  Revision machinery may need to be tightened further to
    treat missing uninteresting objects as non-error events, but this is an
    obvious and safe fix for a maintenance release that is almost good enough.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 27, 2009
  1. Merge branch 'maint-1.6.0' into maint

    gitster committed Jan 27, 2009
    * maint-1.6.0:
      test-path-utils: Fix off by one, found by valgrind
      get_sha1_basic(): fix invalid memory access, found by valgrind
  2. test-path-utils: Fix off by one, found by valgrind

    dscho authored and gitster committed Jan 27, 2009
    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>
  3. get_sha1_basic(): fix invalid memory access, found by valgrind

    dscho authored and gitster committed Jan 27, 2009
    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>
Commits on Jan 25, 2009
  1. GIT 1.6.1.1

    gitster committed Jan 25, 2009
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 24, 2009
  1. Merge branch 'cb/maint-unpack-trees-absense' into maint

    gitster committed Jan 24, 2009
    * 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
  2. Merge branch 'tr/maint-no-index-fixes' into maint

    gitster committed Jan 24, 2009
    * 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
  3. Merge branch 'rs/maint-shortlog-foldline' into maint

    gitster committed Jan 24, 2009
    * rs/maint-shortlog-foldline:
      shortlog: handle multi-line subjects like log --pretty=oneline et. al. do
  4. Merge branch 'pj/maint-ldflags' into maint

    gitster committed Jan 24, 2009
    * pj/maint-ldflags:
      configure clobbers LDFLAGS
  5. Merge branch 'pb/maint-git-pm-false-dir' into maint

    gitster committed Jan 24, 2009
    * pb/maint-git-pm-false-dir:
      Git.pm: correctly handle directory name that evaluates to "false"
  6. Merge branch 'js/maint-bisect-gitk' into maint

    gitster committed Jan 24, 2009
    * js/maint-bisect-gitk:
      bisect view: call gitk if Cygwin's SESSIONNAME variable is set
  7. Merge branch 'js/add-not-submodule' into maint

    gitster committed Jan 24, 2009
    * js/add-not-submodule:
      git add: do not add files from a submodule
  8. Merge branch 'jc/maint-format-patch' into maint

    gitster committed Jan 24, 2009
    * jc/maint-format-patch:
      format-patch: show patch text for the root commit
  9. Merge branch 'am/maint-push-doc' into maint

    gitster committed Jan 24, 2009
    * 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
  10. Merge branch 'maint-1.6.0' into maint

    gitster committed Jan 24, 2009
    * maint-1.6.0:
      Fix Documentation for git-describe
Commits on Jan 23, 2009
  1. Fix Documentation for git-describe

    stephen-smith authored and gitster committed Jan 22, 2009
    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>
Commits on Jan 21, 2009
  1. Rename diff.suppress-blank-empty to diff.suppressBlankEmpty

    dscho authored and gitster committed Jan 20, 2009
    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>
  2. Rename detection: Avoid repeated filespec population

    dotdash authored and gitster committed Jan 20, 2009
    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 again.
    
    To fix that, we first get the blob sizes and only when the blob contents
    are actually required, and when cnt_data will be set, the full filespec is
    populated, once.
    
    Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jan 20, 2009
  1. shell: Document that 'cvs server' is a valid command

    noschinl authored and gitster committed Jan 19, 2009
    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>
Commits on Jan 18, 2009
  1. Documentation: avoid using undefined parameters

    Anders Melchiorsen authored and gitster committed Jan 18, 2009
    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>
  2. Documentation: mention branches rather than heads

    Anders Melchiorsen authored and gitster committed Jan 18, 2009
    The "matching refs" semantics works only on matching branches these days.
    Instead of using "heads" which traditionally has been used more or less
    interchangeably with "refs", say "branch" explicitly here.
    
    Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Documentation: remove a redundant elaboration

    Anders Melchiorsen authored and gitster committed Jan 18, 2009
    The comment in parentheses is wrong, as one has to leave out both the
    colon and <dst>. This situation is covered by the section a few lines
    down:
    
      A parameter <ref> without a colon pushes the <ref> from the source
      repository to the destination repository under the same name.
    
    So, just remove the parentheses.
    
    Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Documentation: git push repository can also be a remote

    Anders Melchiorsen authored and gitster committed Jan 18, 2009
    This is copied from pull-fetch-param.txt and helps the reader
    to not get stuck in the URL section.
    
    Signed-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. Update draft release notes for 1.6.1.1

    gitster committed Jan 18, 2009
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. Merge branch 'maint-1.6.0' into maint

    gitster committed Jan 18, 2009
    * maint-1.6.0:
      builtin-fsck: fix off by one head count
      Documentation: let asciidoc align related options
      githooks.txt: add missing word
      builtin-commit.c: do not remove COMMIT_EDITMSG