Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master

Feb 15, 2010

  1. Junio C Hamano

    Merge branch 'maint'

    * maint:
      fix minor memory leak in get_tree_entry()
    gitster authored
  2. Junio C Hamano

    Merge branch 'maint-1.6.6' into maint

    * maint-1.6.6:
      fix minor memory leak in get_tree_entry()
    gitster authored

Feb 14, 2010

  1. fix minor memory leak in get_tree_entry()

    Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    René Scharfe authored gitster committed

Feb 13, 2010

  1. Junio C Hamano

    Merge branch 'maint'

    * maint:
      Start 1.7.0 maintenance track
    
    Conflicts:
    	RelNotes
    gitster authored
  2. Junio C Hamano

    Merge branch 'rs/git-dir-cleanup'

    * rs/git-dir-cleanup:
      Resurrect "git grep --no-index"
      setenv(GIT_DIR) clean-up
    
    Conflicts:
    	builtin-grep.c
    	t/t7002-grep.sh
    gitster authored
  3. Junio C Hamano

    Merge branch 'jk/cherry-pick-reword'

    * 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
    gitster authored
  4. Junio C Hamano

    Merge branch 'jk/grep-double-dash'

    * jk/grep-double-dash:
      accept "git grep -- pattern"
    gitster authored
  5. Junio C Hamano

    Resurrect "git grep --no-index"

    This reverts commit 3c8f6c8 (Revert 3081623 and 7e62265, 2010-02-05) as
    the issue has been sorted out.
    gitster authored
  6. Junio C Hamano

    Start 1.7.0 maintenance track

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster authored
  7. Junio C Hamano

    Start 1.7.1 cycle

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster authored

Feb 12, 2010

  1. Junio C Hamano

    Git 1.7.0

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster authored
  2. Junio C Hamano

    Merge branch 'maint'

    * maint:
      Fix typo in 1.6.6.2 release notes
      Re-fix check-ref-format documentation mark-up
    gitster authored
  3. Junio C Hamano

    Fix typo in 1.6.6.2 release notes

    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>
    gitster authored
  4. Junio C Hamano

    Re-fix check-ref-format documentation mark-up

    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>
    gitster authored
  5. Junio C Hamano

    archive documentation: attributes are taken from the tree by default

    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>
    gitster authored
  6. Michael J Gruber

    Documentation: minor fixes to RelNotes-1.7.0

    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg authored gitster committed
  7. Gábor Szeder

    bash: support 'git am's new '--continue' option

    Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    szeder authored gitster committed
  8. Junio C Hamano

    Merge branch 'maint'

    * maint:
      filter-branch: Fix error message for --prune-empty --commit-filter
    gitster authored
  9. Jacob Helwig

    filter-branch: Fix error message for --prune-empty --commit-filter

    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>
    jhelwig authored gitster committed
  10. Jeff King

    cherry-pick: prettify the advice message

    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>
    peff authored gitster committed
  11. Jeff King

    cherry-pick: show commit name instead of sha1

    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>
    peff authored gitster committed
  12. Jeff King

    cherry-pick: format help message as strbuf

    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>
    peff authored gitster committed
  13. Jeff King

    cherry-pick: refactor commit parsing code

    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>
    peff authored gitster committed
  14. Jeff King

    cherry-pick: rewrap advice message

    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>
    peff authored gitster committed
  15. Jeff King

    am: switch --resolved to --continue

    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>
    peff authored gitster committed

Feb 10, 2010

  1. Junio C Hamano

    Update draft release notes to 1.7.0 one more time

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster authored
  2. Junio C Hamano

    Sync with 1.6.6.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster authored
  3. Junio C Hamano

    Git 1.6.6.2

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster authored
  4. Junio C Hamano

    Merge branch 'maint-1.6.5' into maint

    * maint-1.6.5:
      t8003: check exit code of command and error message separately
    gitster authored
  5. Junio C Hamano

    t8003: check exit code of command and error message separately

    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>
    gitster authored
  6. Junio C Hamano

    Merge branch 'sp/maint-fast-import-large-blob' into maint

    * sp/maint-fast-import-large-blob:
      fast-import: Stream very large blobs directly to pack
    gitster authored
  7. Junio C Hamano

    Merge branch 'gp/maint-cvsserver' into maint

    * gp/maint-cvsserver:
      git-cvsserver: allow regex metacharacters in CVSROOT
    gitster authored
  8. Junio C Hamano

    Merge branch 'jc/maint-reflog-bad-timestamp' into maint

    * 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
    gitster authored
  9. Junio C Hamano

    Merge branch 'il/maint-xmallocz' into maint

    * 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()
    gitster authored
  10. Junio C Hamano

    Merge branch 'jh/maint-config-file-prefix' into maint

    * jh/maint-config-file-prefix:
      builtin-config: Fix crash when using "-f <relative path>" from non-root dir
    gitster authored
Something went wrong with that request. Please try again.