Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master
Commits on Feb 15, 2010
  1. Junio C Hamano

    Merge branch 'maint'

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

    Merge branch 'maint-1.6.6' into maint

    gitster authored
    * maint-1.6.6:
      fix minor memory leak in get_tree_entry()
Commits on Feb 14, 2010
  1. Junio C Hamano

    fix minor memory leak in get_tree_entry()

    René Scharfe authored gitster committed
    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. Junio C Hamano

    Merge branch 'maint'

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

    Merge branch 'rs/git-dir-cleanup'

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

    Merge branch 'jk/cherry-pick-reword'

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

    Merge branch 'jk/grep-double-dash'

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

    Resurrect "git grep --no-index"

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

    Start 1.7.0 maintenance track

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

    Start 1.7.1 cycle

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

    Git 1.7.0

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

    Merge branch 'maint'

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

    Fix typo in 1.6.6.2 release notes

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

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

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

    archive documentation: attributes are taken from the tree by default

    gitster authored
    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. Michael J Gruber Junio C Hamano

    Documentation: minor fixes to RelNotes-1.7.0

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

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

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

    Merge branch 'maint'

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

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

    jhelwig authored gitster committed
    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. Jeff King Junio C Hamano

    cherry-pick: prettify the advice message

    peff authored gitster committed
    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. Jeff King Junio C Hamano

    cherry-pick: show commit name instead of sha1

    peff authored gitster committed
    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. Jeff King Junio C Hamano

    cherry-pick: format help message as strbuf

    peff authored gitster committed
    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. Jeff King Junio C Hamano

    cherry-pick: refactor commit parsing code

    peff authored gitster committed
    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. Jeff King Junio C Hamano

    cherry-pick: rewrap advice message

    peff authored gitster committed
    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. Jeff King Junio C Hamano

    am: switch --resolved to --continue

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

    Update draft release notes to 1.7.0 one more time

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

    Sync with 1.6.6.2

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

    Git 1.6.6.2

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

    Merge branch 'maint-1.6.5' into maint

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

    t8003: check exit code of command and error message separately

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

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

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

    Merge branch 'gp/maint-cvsserver' into maint

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

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

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

    Merge branch 'il/maint-xmallocz' into maint

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

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

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