Permalink
Commits on Feb 7, 2009
  1. GIT 1.6.1.3

    gitster committed Feb 7, 2009
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 6, 2009
  1. Merge branch 'maint-1.6.0' into maint

    gitster committed Feb 6, 2009
    * maint-1.6.0:
      Fixed broken git help -w when installing from RPM
  2. Merge branch 'jc/maint-apply-fix' into maint

    gitster committed Feb 6, 2009
    * jc/maint-apply-fix:
      builtin-apply.c: do not set bogus mode in check_preimage() for deleted path
  3. Merge branch 'am/maint-push-doc' into maint

    gitster committed Feb 6, 2009
    * am/maint-push-doc:
      Documentation: rework src/dst description in git push
      Documentation: more git push examples
      Documentation: simplify refspec format description
  4. Merge branch 'sg/maint-gitdir-in-subdir' into maint

    gitster committed Feb 6, 2009
    * sg/maint-gitdir-in-subdir:
      Fix gitdir detection when in subdir of gitdir
  5. Merge branch 'lt/maint-wrap-zlib' into maint

    gitster committed Feb 6, 2009
    * lt/maint-wrap-zlib:
      Wrap inflate and other zlib routines for better error reporting
    
    Conflicts:
    	http-push.c
    	http-walker.c
    	sha1_file.c
  6. Merge branch 'jc/maint-split-diff-metainfo' into maint

    gitster committed Feb 6, 2009
    * jc/maint-split-diff-metainfo:
      diff.c: output correct index lines for a split diff
  7. Merge branch 'js/maint-all-implies-HEAD' into maint

    gitster committed Feb 6, 2009
    * js/maint-all-implies-HEAD:
      bundle: allow the same ref to be given more than once
      revision walker: include a detached HEAD in --all
  8. Merge branch 'kc/maint-diff-bwi-fix' into maint

    gitster committed Feb 6, 2009
    * kc/maint-diff-bwi-fix:
      Fix combined use of whitespace ignore options to diff
      test more combinations of ignore-whitespace options to diff
Commits on Feb 5, 2009
  1. Fixed broken git help -w when installing from RPM

    dmellor authored and gitster committed Feb 5, 2009
    After the git-core package was renamed to git, git help -w was still looking
    for files in /usr/share/doc/git-core-$VERSION instead of
    /usr/share/doc/git-$VERSION.
    
    Signed-off-by: David J. Mellor <dmellor@whistlingcat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 4, 2009
  1. urls.txt: document optional port specification in git URLS

    snaewe authored and gitster committed Feb 4, 2009
    Signed-off-by: Stefan Naewe <stefan.naewe+git@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'maint-1.6.0' into maint

    gitster committed Feb 4, 2009
    * maint-1.6.0:
      builtin-mv.c: check for unversionned files before looking at the destination.
      Add a testcase for "git mv -f" on untracked files.
      Missing && in t/t7001.sh.
  3. builtin-mv.c: check for unversionned files before looking at the dest…

    moy authored and gitster committed Feb 4, 2009
    …ination.
    
    The previous code was failing in the case where one moves an
    unversionned file to an existing destination, with mv -f: the
    "existing destination" was checked first, and the error was cancelled
    by the force flag.
    
    We now check the unrecoverable error first, which fixes the bug.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Add a testcase for "git mv -f" on untracked files.

    moy authored and gitster committed Feb 4, 2009
    This currently fails with:
    git: builtin-mv.c:217: cmd_mv: Assertion `pos >= 0' failed.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. Missing && in t/t7001.sh.

    moy authored and gitster committed Feb 4, 2009
    Without this, the exit status is only the one of the last line.
    
    Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. Merge branch 'maint-1.6.0' into maint

    gitster committed Feb 4, 2009
    * maint-1.6.0:
      User-manual: "git stash <comment>" form is long gone
      add test-dump-cache-tree in Makefile
      fix typo in Documentation
      apply: fix access to an uninitialized mode variable, found by valgrind
  7. User-manual: "git stash <comment>" form is long gone

    wrp authored and gitster committed Feb 3, 2009
    These days you must explicitly say "git stash save <comment>".
    
    Signed-off-by: William Pursell <bill.pursell@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. add test-dump-cache-tree in Makefile

    guanqun authored and gitster committed Feb 4, 2009
    5c5ba73 (Makefile: Use generic rule to build test programs,
    2007-05-31) tried to use generic rule to build test programs, but it
    misses the file 'dump-cache-tree.c', since its name is not prefixed by
    'test-'.  This commit solves this little problem by renaming this file
    instead of carrying out an explicit rule in Makefile.
    
    Signed-off-by: Guanqun Lu <guanqun.lu@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  9. fix typo in Documentation

    guanqun authored and gitster committed Feb 4, 2009
    Signed-off-by: Guanqun Lu <guanqun.lu@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  10. apply: fix access to an uninitialized mode variable, found by valgrind

    dscho authored and gitster committed Feb 4, 2009
    When 'tpatch' was initialized successfully, st_mode was already taken
    from the previous diff.  We should not try to override it with data
    from an lstat() that was never called.
    
    This is a companion patch to 7a07841(git-apply: handle a patch that
    touches the same path more than once better).
    
    Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 3, 2009
  1. Merge branch 'maint-1.6.0' into maint

    gitster committed Feb 3, 2009
    * maint-1.6.0:
      grep: pass -I (ignore binary) down to external grep
Commits on Feb 2, 2009
  1. grep: pass -I (ignore binary) down to external grep

    gitster committed Feb 2, 2009
    We forgot to pass this option to the external grep process.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 1, 2009
  1. Merge branch 'maint-1.6.0' into maint

    gitster committed Feb 1, 2009
    * maint-1.6.0:
      merge: fix out-of-bounds memory access
Commits on Jan 31, 2009
  1. merge: fix out-of-bounds memory access

    René Scharfe authored and gitster committed Jan 31, 2009
    The parameter n of unpack_callback() can have a value of up to
    MAX_UNPACK_TREES.  The check at the top of unpack_trees() (its only
    (indirect) caller) makes sure it cannot exceed this limit.
    
    unpack_callback() passes it and the array src to unpack_nondirectories(),
    which has this loop:
    
    	for (i = 0; i < n; i++) {
    		/* ... */
    		src[i + o->merge] = o->df_conflict_entry;
    
    o->merge can be 0 or 1, so unpack_nondirectories() potentially accesses
    the array src at index MAX_UNPACK_TREES.  This patch makes it big enough.
    
    Reported-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
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>
  11. builtin-apply.c: do not set bogus mode in check_preimage() for delete…

    gitster committed Jan 26, 2009
    …d 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>