Permalink
Commits on Jun 4, 2009
  1. GIT 1.6.3.2

    gitster committed Jun 4, 2009
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 3, 2009
  1. grep: fix empty word-regexp matches

    René Scharfe authored and gitster committed Jun 3, 2009
    The command "git grep -w ''" dies as soon as it encounters an empty line,
    reporting (wrongly) that "regexp returned nonsense".  The first hunk of
    this patch relaxes the sanity check that is responsible for that,
    allowing matches to start at the end.
    
    The second hunk complements it by making sure that empty matches are
    rejected if -w was specified, as they are not really words.
    
    GNU grep does the same:
    
    	$ echo foo | grep -c ''
    	1
    	$ echo foo | grep -c -w ''
    	0
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. blame: correctly handle a path that used to be a directory

    gitster committed Jun 3, 2009
    When trying to see if the same path exists in the parent, we ran
    "diff-tree" with pathspec set to the path we are interested in with the
    parent, and expect either to have exactly one resulting filepair (either
    "changed from the parent", "created when there was none") or nothing (when
    there is no change from the parent).
    
    If the path used to be a directory, however, we will also see unbounded
    number of entries that talk about the files that used to exist underneath
    the directory in question.  Correctly pick only the entry that describes
    the path we are interested in in such a case (namely, the creation of the
    path as a regular file).
    
    Noticed by Ben Willard.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. add -i: do not dump patch during application

    trast authored and gitster committed Jun 2, 2009
    Remove a debugging print that snuck in at 7a26e65 (Revert
    "git-add--interactive: remove hunk coalescing", 2009-05-16).
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Jun 2, 2009
  1. Update draft release notes for 1.6.3.2

    gitster committed Jun 2, 2009
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint

    gitster committed Jun 2, 2009
    * cb/maint-1.6.0-xdl-merge-fix:
      Change xdl_merge to generate output even for null merges
      t6023: merge-file fails to output anything for a degenerate merge
    
    Conflicts:
    	xdiff/xmerge.c
  3. Merge branch 'rs/maint-grep-word-regexp-fix' into maint

    gitster committed Jun 2, 2009
    * rs/maint-grep-word-regexp-fix:
      grep: fix colouring of matches with zero length
      grep: fix word-regexp at the beginning of lines
  4. Merge branch 'sb/maint-1.6.2-opt-filename-fix' into maint

    gitster committed Jun 2, 2009
    * sb/maint-1.6.2-opt-filename-fix:
      apply, fmt-merge-msg: use relative filenames
      commit: -F overrides -t
  5. Merge branch 'jc/maint-add-p-coalesce-fix' into maint

    gitster committed Jun 2, 2009
    * jc/maint-add-p-coalesce-fix:
      t3701: ensure correctly set up repository after skipped tests
      Revert "git-add--interactive: remove hunk coalescing"
      Splitting a hunk that adds a line at the top fails in "add -p"
  6. Merge branch 'tr/maint-doc-stash-pop' into maint

    gitster committed Jun 2, 2009
    * tr/maint-doc-stash-pop:
      Documentation: teach stash/pop workflow instead of stash/apply
  7. grep: fix colouring of matches with zero length

    René Scharfe authored and gitster committed Jun 1, 2009
    If a zero-length match is encountered, break out of loop and show the rest
    of the line uncoloured.  Otherwise we'd be looping forever, trying to make
    progress by advancing the pointer by zero characters.
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 29, 2009
  1. Documentation: teach stash/pop workflow instead of stash/apply

    trast authored and gitster committed May 28, 2009
    Recent discussion on the list showed some comments in favour of a
    stash/pop workflow:
    
      http://marc.info/?l=git&m=124234911423358&w=2
      http://marc.info/?l=git&m=124235348327711&w=2
    
    Change the stash documentation and examples to document pop in its own
    right (and apply in terms of pop), and use stash/pop in the examples.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 28, 2009
  1. fix segfault showing an empty remote

    Clemens Buchacher authored and gitster committed May 27, 2009
    In case of an empty list, the search for its tail caused a
    NULL-pointer dereference.
    
    Signed-off-by: Clemens Buchacher <drizzd@aon.at>
    Reported-by: Erik Faye-Lund <kusmabite@googlemail.com>
    Acked-by: Jay Soffian <jaysoffian@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 26, 2009
  1. Prepare for 1.6.3.2

    gitster committed May 26, 2009
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'js/maint-no-ln-across-libexec-and-bin' into maint

    gitster committed May 26, 2009
    * js/maint-no-ln-across-libexec-and-bin:
      Add NO_CROSS_DIRECTORY_HARDLINKS support to the Makefile
    
    Conflicts:
    	Makefile
  3. Merge branch 'lt/maint-diff-reduce-lstat' into maint

    gitster committed May 26, 2009
    * lt/maint-diff-reduce-lstat:
      Teach 'git checkout' to preload the index contents
      Avoid unnecessary 'lstat()' calls in 'get_stat_data()'
  4. Merge branch 'jm/format-patch-no-auto-n-when-k-is-given' into maint

    gitster committed May 26, 2009
    * jm/format-patch-no-auto-n-when-k-is-given:
      format-patch let -k override a config-specified format.numbered
  5. Merge branch 'do/maint-merge-recursive-fix' into maint

    gitster committed May 26, 2009
    * do/maint-merge-recursive-fix:
      merge-recursive: never leave index unmerged while recursing
  6. Merge branch 'jk/maint-1.6.0-trace-argv' into maint

    gitster committed May 26, 2009
    * jk/maint-1.6.0-trace-argv:
      fix GIT_TRACE segfault with shell-quoted aliases
    
    Conflicts:
    	alias.c
  7. Merge branch 'np/push-delta' into maint

    gitster committed May 26, 2009
    * np/push-delta:
      allow OFS_DELTA objects during a push
  8. Merge branch 'ar/merge-one-file-diag' into maint

    gitster committed May 26, 2009
    * ar/merge-one-file-diag:
      Clarify kind of conflict in merge-one-file helper
  9. Merge branch 'ar/unlink-err' into maint

    gitster committed May 26, 2009
    * ar/unlink-err:
      print unlink(2) errno in copy_or_link_directory
      replace direct calls to unlink(2) with unlink_or_warn
      Introduce an unlink(2) wrapper which gives warning if unlink failed
  10. Merge branch 'jk/maint-add-empty' into maint

    gitster committed May 26, 2009
    * jk/maint-add-empty:
      add: don't complain when adding empty project root
Commits on May 25, 2009
  1. fix cat-file usage message and documentation

    peff authored and gitster committed May 25, 2009
    cat-file with an object on the command line requires an
    option to tell it what to output (type, size, pretty-print,
    etc). However, the square brackets in the usage imply that
    those options are not required. This patch switches them to
    parentheses to indicate "required but grouped-OR" (curly
    braces might also work, but this follows the convention used
    already by "git stash").
    
    While we're at it, let's change the <sha1> specifier in the
    usage to <object>. That's what the documentation uses, and
    it does actually use the regular object lookup.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. fetch: report ref storage DF errors more accurately

    peff authored and gitster committed May 25, 2009
    When we fail to store a fetched ref, we recommend that the
    user try running "git prune" to remove up any old refs that
    have been deleted by the remote, which would clear up any DF
    conflicts. However, ref storage might fail for other
    reasons (e.g., permissions problems) in which case the
    advice is useless and misleading.
    
    This patch detects when there is an actual DF situation and
    only issues the advice when one is found.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. lock_ref: inform callers of unavailable ref

    peff authored and gitster committed May 25, 2009
    One of the ways that locking might fail is that there is a
    DF conflict between two refs (e.g., you want to lock
    "foo/bar" but "foo" already exists). In this case, we return
    an error, but there is no way for the caller to know the
    specific problem.
    
    This patch sets errno to ENOTDIR, which is the most sensible
    code. It's what we would see if the refs were stored purely
    in the filesystem (but these days we must check the
    namespace manually due to packed refs).
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. t3701: ensure correctly set up repository after skipped tests

    j6t authored and gitster committed May 25, 2009
    There are two tests that are skipped if file modes are not obeyed by the
    file system. In this case, the subsequent test failed because the
    repository was in an unexpected state. This corrects it.
    
    Signed-off-by: Johannes Sixt <j6t@kdbg.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. merge-options.txt: Clarify merge --squash

    mjg authored and gitster committed May 25, 2009
    With the --squash option, merge sets up the index just like for a real
    merge, but without the merge info (stages). Say so.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. Change xdl_merge to generate output even for null merges

    hashpling authored and gitster committed May 25, 2009
    xdl_merge used to have a check to ensure that there was at least
    some change in one or other side being merged but this suppressed
    output for the degenerate case when base, local and remote
    contents were all identical.
    
    Removing this check enables correct output in the degenerate case
    and xdl_free_script handles freeing NULL scripts so there is no
    need to have the check for these calls.
    
    Signed-off-by: Charles Bailey <charles@hashpling.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. t6023: merge-file fails to output anything for a degenerate merge

    hashpling authored and gitster committed May 25, 2009
    In the case that merge-file is passed three files with identical
    contents it wipes the contents of the output file instead of
    leaving it unchanged.
    
    Althought merge-file is porcelain and this will never happen in
    normal usage, it is still wrong.
    
    Signed-off-by: Charles Bailey <charles@hashpling.org>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 24, 2009
  1. Merge branch 'maint-1.6.2' into maint

    gitster committed May 24, 2009
    * maint-1.6.2:
      http-push.c::remove_locks(): fix use after free
  2. Merge branch 'maint-1.6.1' into maint-1.6.2

    gitster committed May 24, 2009
    * maint-1.6.1:
      http-push.c::remove_locks(): fix use after free
  3. Merge branch 'maint-1.6.0' into maint-1.6.1

    gitster committed May 24, 2009
    * maint-1.6.0:
      http-push.c::remove_locks(): fix use after free
  4. http-push.c::remove_locks(): fix use after free

    raalkml authored and gitster committed May 24, 2009
    Noticed and reported by Serhat Şevki Dinçer.
    
    Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
    Acked-by: Clemens Buchacher <drizzd@aon.at>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on May 23, 2009
  1. grep: fix word-regexp at the beginning of lines

    René Scharfe authored and gitster committed May 23, 2009
    After bol is forwarded, it doesn't represent the beginning of the line
    any more.  This means that the beginning-of-line marker (^) mustn't match,
    i.e. the regex flag REG_NOTBOL needs to be set.
    
    This bug was introduced by fb62eb7
    ("grep -w: forward to next possible position after rejected match").
    
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>