Permalink
Commits on Jun 30, 2010
  1. Git 1.7.2-rc1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 30, 2010
  2. git.spec.in: Add gitweb subpackage

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 30, 2010
  3. Merge branch 'ar/decorate-color'

    * ar/decorate-color:
      Add test for correct coloring of git log --decoration
      Allow customizable commit decorations colors
      log --decorate: Colorize commit decorations
      log-tree.c: Use struct name_decoration's type for classifying decoration
      commit.h: add 'type' to struct name_decoration
    gitster committed Jun 30, 2010
  4. Merge branch 'mg/doc-rev-parse-treepath-syntax'

    * mg/doc-rev-parse-treepath-syntax:
      git-rev-parse.txt: Add more examples for caret and colon
      git-rev-parse.txt: Document ":path" specifier
    gitster committed Jun 30, 2010
  5. Merge branch 'cc/cherry-pick-stdin'

    * cc/cherry-pick-stdin:
      revert: do not rebuild argv on heap
      revert: accept arbitrary rev-list options
      t3508 (cherry-pick): futureproof against unmerged files
    gitster committed Jun 30, 2010
  6. Merge branch 'jl/status-ignore-submodules'

    * jl/status-ignore-submodules:
      Add the option "--ignore-submodules" to "git status"
      git submodule: ignore dirty submodules for summary and status
    
    Conflicts:
    	builtin/commit.c
    	t/t7508-status.sh
    	wt-status.c
    	wt-status.h
    gitster committed Jun 30, 2010
  7. Merge branch 'jk/url-decode'

    * jk/url-decode:
      url_decode: URL scheme ends with a colon and does not require a slash
    gitster committed Jun 30, 2010
  8. Merge branch 'jn/grep-open'

    * jn/grep-open:
      t/t7811-grep-open.sh: remove broken/redundant creation of fake "less" script
      t/t7811-grep-open.sh: ensure fake "less" is made executable
      t/lib-pager.sh: remove unnecessary '^' from 'expr' regular expression
      grep -O: allow optional argument specifying the pager (or editor)
      grep: Add the option '--open-files-in-pager'
      Unify code paths of threaded greps
      grep: refactor grep_objects loop into its own function
    
    Conflicts:
    	t/t7006-pager.sh
    gitster committed Jun 30, 2010
  9. Merge branch 'jp/string-list-api-cleanup'

    * jp/string-list-api-cleanup:
      string_list: Fix argument order for string_list_append
      string_list: Fix argument order for string_list_lookup
      string_list: Fix argument order for string_list_insert_at_index
      string_list: Fix argument order for string_list_insert
      string_list: Fix argument order for for_each_string_list
      string_list: Fix argument order for print_string_list
    gitster committed Jun 30, 2010
  10. Merge branch 'tr/rev-list-count'

    * tr/rev-list-count:
      bash completion: Support "divergence from upstream" messages in __git_ps1
      rev-list: introduce --count option
    
    Conflicts:
    	contrib/completion/git-completion.bash
    gitster committed Jun 30, 2010
  11. Merge branch 'as/maint-completion-set-u-fix'

    * as/maint-completion-set-u-fix:
      bash-completion: Fix __git_ps1 to work with "set -u"
    gitster committed Jun 30, 2010
  12. Merge branch 'mg/rev-parse-tests'

    * mg/rev-parse-tests:
      t6018: make sure all tested symbolic names are different revs
      t6018: add tests for rev-list's --branches and --tags
    gitster committed Jun 30, 2010
  13. Merge branch 'jl/maint-diff-ignore-submodules'

    * jl/maint-diff-ignore-submodules:
      t4027,4041: Use test -s to test for an empty file
      Add optional parameters to the diff option "--ignore-submodules"
      git diff: rename test that had a conflicting name
    gitster committed Jun 30, 2010
  14. Add test for correct coloring of git log --decoration

    Signed-off-by: Nazri Ramliy <ayiehere@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    nazri committed with gitster Jun 29, 2010
Commits on Jun 29, 2010
  1. Sync with 1.7.1.1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 29, 2010
  2. revert: do not rebuild argv on heap

    Set options in struct rev_info directly so we can reuse the
    arguments collected from parse_options without modification.
    
    This is just a cleanup; no noticeable change is intended.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster Jun 14, 2010
  3. Merge commit 'v1.7.2-rc0~6^2' into cc/cherry-pick-stdin

    * commit 'v1.7.2-rc0~6^2':
      DWIM 'git show -5' to 'git show --do-walk -5'
      Documentation/SubmittingPatches: Fix typo in GMail section
      Documentation/config: describe status.submodulesummary
    
    This commit fixes one test in t3508 by making "cherry-pick -<num>"
    walk the history.
    
    A test update from Elijah Newren is squashed as an evil merge.
    gitster committed Jun 29, 2010
  4. Git 1.7.1.1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 29, 2010
  5. t/t9001: use egrep when regular expressions are involved

    Supplying backslashed, extended regular expressions to grep is not
    portable.  Use egrep instead.
    
    Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    drafnel committed with gitster Jun 28, 2010
  6. git-rev-parse.txt: Add more examples for caret and colon

    Several items in the caret, colon and friends section contain examples
    already. Make sure they all come with examples, and that examples come
    early so that they serve as a visual guide, as well.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg committed with gitster Jun 28, 2010
  7. Merge branch 'maint'

    * maint:
      Update draft release notes to 1.7.1.1
      notes: Initialise variable to appease gcc
      notes: check number of parameters to "git notes copy"
    gitster committed Jun 29, 2010
  8. Update draft release notes to 1.7.1.1

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 29, 2010
Commits on Jun 28, 2010
  1. Merge branch 'tr/send-email-8bit' into maint

    * tr/send-email-8bit:
      send-email: ask about and declare 8bit mails
    gitster committed Jun 28, 2010
  2. Merge branch 'pb/maint-perl-errmsg-no-dir' into maint

    * pb/maint-perl-errmsg-no-dir:
      Git.pm: better error message
    gitster committed Jun 28, 2010
  3. Merge branch 'js/maint-am-rebase-invalid-author' into maint

    * js/maint-am-rebase-invalid-author:
      am: use get_author_ident_from_commit instead of mailinfo when rebasing
    gitster committed Jun 28, 2010
  4. Merge branch 'jc/maint-simpler-common-prefix' into maint

    * jc/maint-simpler-common-prefix:
      common_prefix: simplify and fix scanning for prefixes
    gitster committed Jun 28, 2010
  5. Merge branch 'bd/maint-unpack-trees-parawalk-fix' into maint

    * bd/maint-unpack-trees-parawalk-fix:
      unpack-trees: Make index lookahead less pessimal
    gitster committed Jun 28, 2010
  6. notes: Initialise variable to appease gcc

    gcc version 3.4.4 thinks that the 'cmp' variable could be used
    while uninitialised and complains thus:
    
        notes.c: In function `write_each_non_note_until':
        notes.c:719: warning: 'cmp' might be used uninitialized in \
            this function
    
    Note that gcc versions 4.1.2 and 4.4.0 do not issue this warning.
    
    Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Ramsay Jones committed with gitster Jun 21, 2010
  7. notes: check number of parameters to "git notes copy"

    Otherwise we may segfault with too few parameters.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Tested-by: Bert Wesarg <Bert.Wesarg@googlemail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Jun 28, 2010
  8. msvc: Select the "fast" definition of the {get,put}_be32() macros

    On Intel machines, the msvc compiler defines the CPU architecture
    macros _M_IX86 and _M_X64 (equivalent to __i386__ and __x86_64__
    respectively). Use these macros in the pre-processor expression
    to select the "fast" definition of the {get,put}_be32() macros.
    
    Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
    Acked-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Ramsay Jones committed with gitster Jun 23, 2010
Commits on Jun 27, 2010
  1. git-rev-parse.txt: Document ":path" specifier

    The empty treeish in ":path" means "index". This is actually a special
    case of the ":stage:path" syntax where it is documented, but mentioning
    it also together with "treeish:path" is helpful, so do it.
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg committed with gitster Jun 27, 2010
  2. Git 1.7.2-rc0

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 27, 2010
  3. Merge branch 'cp/textconv-cat-file'

    * cp/textconv-cat-file:
      git-cat-file.txt: Document --textconv
      t/t8007: test textconv support for cat-file
      textconv: support for cat_file
      sha1_name: add get_sha1_with_context()
    gitster committed Jun 27, 2010
  4. Merge branch 'pb/maint-perl-errmsg-no-dir'

    * pb/maint-perl-errmsg-no-dir:
      Git.pm: better error message
    gitster committed Jun 27, 2010
  5. Merge branch 'tr/send-email-8bit'

    * tr/send-email-8bit:
      send-email: ask about and declare 8bit mails
    gitster committed Jun 27, 2010