Permalink
Commits on Feb 15, 2010
  1. Merge branch 'maint'

    gitster committed Feb 15, 2010
    * maint:
      fix minor memory leak in get_tree_entry()
  2. Merge branch 'maint-1.6.6' into maint

    gitster committed Feb 15, 2010
    * maint-1.6.6:
      fix minor memory leak in get_tree_entry()
Commits on Feb 14, 2010
  1. fix minor memory leak in get_tree_entry()

    René Scharfe authored and gitster committed Feb 14, 2010
    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 13, 2010
  1. Merge branch 'maint'

    gitster committed Feb 13, 2010
    * maint:
      Start 1.7.0 maintenance track
    
    Conflicts:
    	RelNotes
  2. Merge branch 'rs/git-dir-cleanup'

    gitster committed Feb 13, 2010
    * rs/git-dir-cleanup:
      Resurrect "git grep --no-index"
      setenv(GIT_DIR) clean-up
    
    Conflicts:
    	builtin-grep.c
    	t/t7002-grep.sh
  3. Merge branch 'jk/cherry-pick-reword'

    gitster committed Feb 13, 2010
    * jk/cherry-pick-reword:
      cherry-pick: prettify the advice message
      cherry-pick: show commit name instead of sha1
      cherry-pick: format help message as strbuf
      cherry-pick: refactor commit parsing code
      cherry-pick: rewrap advice message
  4. Merge branch 'jk/grep-double-dash'

    gitster committed Feb 13, 2010
    * jk/grep-double-dash:
      accept "git grep -- pattern"
  5. Resurrect "git grep --no-index"

    gitster committed Feb 6, 2010
    This reverts commit 3c8f6c8 (Revert 3081623 and 7e62265, 2010-02-05) as
    the issue has been sorted out.
  6. Start 1.7.0 maintenance track

    gitster committed Feb 13, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. Start 1.7.1 cycle

    gitster committed Feb 13, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 12, 2010
  1. Git 1.7.0

    gitster committed Feb 12, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Merge branch 'maint'

    gitster committed Feb 12, 2010
    * maint:
      Fix typo in 1.6.6.2 release notes
      Re-fix check-ref-format documentation mark-up
  3. Fix typo in 1.6.6.2 release notes

    gitster committed Feb 12, 2010
    Of course, these are changes since 1.6.6.1; changes since 1.6.6.2
    would have been nil.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Re-fix check-ref-format documentation mark-up

    gitster committed Feb 12, 2010
    It is not double-backslash we forbid; backslashes are forbidden since
    a4c2e69 (Disallow '\' in ref names, 2009-05-08)
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  5. archive documentation: attributes are taken from the tree by default

    gitster committed Feb 10, 2010
    By default, git-archive takes attributes from the tree being archived.
    People however often wonder why their attempts to affect the way how the
    command archives their tree by changing .gitattributes in their work tree
    fail.
    
    Add a bit of explanatory note to tell them how to achieve what they want
    to do.
    
    Noticed-by: Francois Marier
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. Documentation: minor fixes to RelNotes-1.7.0

    mjg authored and gitster committed Feb 12, 2010
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  7. bash: support 'git am's new '--continue' option

    szeder authored and gitster committed Feb 12, 2010
    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  8. Merge branch 'maint'

    gitster committed Feb 12, 2010
    * maint:
      filter-branch: Fix error message for --prune-empty --commit-filter
  9. filter-branch: Fix error message for --prune-empty --commit-filter

    jhelwig authored and gitster committed Feb 12, 2010
    Running filter-branch with --prune-empty and --commit-filter reports:
    
      "Cannot set --prune-empty and --filter-commit at the same time".
    
    Change it to use the correct option name: --commit-filter
    
    Signed-off-by: Jacob Helwig <jacob.helwig@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  10. cherry-pick: prettify the advice message

    peff authored and gitster committed Feb 11, 2010
    It's hard to see the "how to commit" part of this message,
    which users may want to cut and paste. On top of that,
    having it in paragraph form means that a really long commit
    name may cause ugly wrapping. Let's make it prettier, like:
    
      Automatic cherry-pick failed.  After resolving the conflicts,
      mark the corrected paths with 'git add <paths>' or 'git rm <paths>'
      and commit the result with:
    
              git commit -c HEAD~23
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  11. cherry-pick: show commit name instead of sha1

    peff authored and gitster committed Feb 11, 2010
    When we have a conflict, we advise the user to do:
    
      git commit -c $sha1
    
    This works fine, but is unnecessarily confusing and annoying
    for the user to type, when:
    
      git commit -c $the_thing_you_called_cherry_pick_with
    
    works just as well.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  12. cherry-pick: format help message as strbuf

    peff authored and gitster committed Feb 11, 2010
    This gets rid of the fixed-size buffer and an unchecked
    sprintf. That sprintf is actually OK as the only
    variable-sized thing put in it is an abbreviated sha1, which
    is bounded at 40 characters. However, the next patch will
    change that to something unbounded.
    
    Note that this function now returns an allocated buffer
    instead of a static one; however, it doesn't matter as the
    only caller exits immediately.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  13. cherry-pick: refactor commit parsing code

    peff authored and gitster committed Feb 11, 2010
    These lines are really just lookup_commit_reference
    re-implemented.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  14. cherry-pick: rewrap advice message

    peff authored and gitster committed Feb 11, 2010
    The current message overflows on an 80-character terminal.
    While we're at it, fix the spelling of 'committing'.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  15. am: switch --resolved to --continue

    peff authored and gitster committed Feb 11, 2010
    Rebase calls this same function "--continue", which means
    users may be trained to type it. There is no reason to
    deprecate --resolved (or -r), so we will keep it as a
    synonym.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
Commits on Feb 10, 2010
  1. Update draft release notes to 1.7.0 one more time

    gitster committed Feb 10, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  2. Sync with 1.6.6.2

    gitster committed Feb 10, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  3. Git 1.6.6.2

    gitster committed Feb 10, 2010
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  4. Merge branch 'maint-1.6.5' into maint

    gitster committed Feb 10, 2010
    * maint-1.6.5:
      t8003: check exit code of command and error message separately
  5. t8003: check exit code of command and error message separately

    gitster committed Feb 9, 2010
    Shell reports exit status only from the most downstream command
    in a pipeline.  In these tests, we want to make sure that the
    command fails in a controlled way, and produces a correct error
    message.
    
    This issue was known by Jay who submitted the patch, and also was
    pointed out by Hannes during the review process, but I forgot to
    fix it up before applying.  Sorry about that.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
  6. Merge branch 'sp/maint-fast-import-large-blob' into maint

    gitster committed Feb 10, 2010
    * sp/maint-fast-import-large-blob:
      fast-import: Stream very large blobs directly to pack
  7. Merge branch 'gp/maint-cvsserver' into maint

    gitster committed Feb 10, 2010
    * gp/maint-cvsserver:
      git-cvsserver: allow regex metacharacters in CVSROOT
  8. Merge branch 'jc/maint-reflog-bad-timestamp' into maint

    gitster committed Feb 10, 2010
    * jc/maint-reflog-bad-timestamp:
      t0101: use a fixed timestamp when searching in the reflog
      Update @{bogus.timestamp} fix not to die()
      approxidate_careful() reports errorneous date string
  9. Merge branch 'il/maint-xmallocz' into maint

    gitster committed Feb 10, 2010
    * il/maint-xmallocz:
      Fix integer overflow in unpack_compressed_entry()
      Fix integer overflow in unpack_sha1_rest()
      Fix integer overflow in patch_delta()
      Add xmallocz()
  10. Merge branch 'jh/maint-config-file-prefix' into maint

    gitster committed Feb 10, 2010
    * jh/maint-config-file-prefix:
      builtin-config: Fix crash when using "-f <relative path>" from non-root dir