Skip to content
Commits on Jun 1, 2011
  1. @gitster

    Sync with 1.7.5.4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 1, 2011
  2. @gitster

    Git 1.7.5.4

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Jun 1, 2011
  3. @gitster

    Merge branch 'jk/maint-config-alias-fix' into maint

    * jk/maint-config-alias-fix:
      handle_options(): do not miscount how many arguments were used
      config: always parse GIT_CONFIG_PARAMETERS during git_config
      git_config: don't peek at global config_parameters
      config: make environment parsing routines static
    gitster committed Jun 1, 2011
  4. @gitster

    Merge branch 'jc/fmt-req-fix' into maint

    * jc/fmt-req-fix:
      userformat_find_requirements(): find requirement for the correct format
    gitster committed Jun 1, 2011
  5. @gitster

    Merge branch 'jk/maint-docs' into maint

    * jk/maint-docs:
      docs: fix some antique example output
      docs: make sure literal "->" isn't converted to arrow
      docs: update status --porcelain format
      docs: minor grammar fixes to git-status
    gitster committed Jun 1, 2011
  6. @gitster

    Merge branch 'jn/doc-remote-helpers' into maint

    * jn/doc-remote-helpers:
      Documentation: do not misinterpret refspecs as bold text
    gitster committed Jun 1, 2011
  7. @gitster

    Merge branch 'kk/maint-prefix-in-config-mak' into maint

    * kk/maint-prefix-in-config-mak:
      config.mak.in: allow "configure --sysconfdir=/else/where"
    gitster committed Jun 1, 2011
  8. @meyering @gitster

    diffcore-rename.c: avoid set-but-not-used warning

    Since 9d8a5a5 (diffcore-rename: refactor "too many candidates" logic,
    2011-01-06), diffcore_rename() initializes num_src but does not use it
    anymore.  "-Wunused-but-set-variable" in gcc-4.6 complains about this.
    
    Signed-off-by: Jim Meyering <meyering@redhat.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    meyering committed with gitster Apr 29, 2011
Commits on May 31, 2011
  1. @gitster

    Update draft release notes to 1.7.6

    I think we are almost there for the feature freeze.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed May 31, 2011
  2. @gitster

    Merge branch 'jk/format-patch-am'

    * jk/format-patch-am:
      format-patch: preserve subject newlines with -k
      clean up calling conventions for pretty.c functions
      pretty: add pp_commit_easy function for simple callers
      mailinfo: always clean up rfc822 header folding
      t: test subject handling in format-patch / am pipeline
    
    Conflicts:
    	builtin/branch.c
    	builtin/log.c
    	commit.h
    gitster committed May 31, 2011
  3. @gitster

    Merge branch 'jn/doc-remote-helpers'

    * jn/doc-remote-helpers:
      Documentation: do not misinterpret refspecs as bold text
    gitster committed May 31, 2011
  4. @gitster

    Merge branch 'jk/format-patch-empty-prefix'

    * jk/format-patch-empty-prefix:
      format-patch: make zero-length subject prefixes prettier
    gitster committed May 31, 2011
  5. @gitster

    Merge branch 'ab/i18n-envsubst-doc-fix'

    * ab/i18n-envsubst-doc-fix:
      git-sh-i18n--envsubst: add SYNOPSIS section to the documentation
    gitster committed May 31, 2011
  6. @gitster

    Merge branch 'jc/log-quiet-fix'

    * jc/log-quiet-fix:
      log: --quiet should serve as synonym to -s
    gitster committed May 31, 2011
  7. @gitster

    Merge branch 'kk/maint-prefix-in-config-mak'

    * kk/maint-prefix-in-config-mak:
      config.mak.in: allow "configure --sysconfdir=/else/where"
    gitster committed May 31, 2011
  8. @gitster

    Merge branch 'jk/rebase-head-reflog'

    * jk/rebase-head-reflog:
      rebase: write a reflog entry when finishing
      rebase: create HEAD reflog entry when aborting
    gitster committed May 31, 2011
  9. @gitster

    Merge branch 'jk/maint-docs'

    * jk/maint-docs:
      docs: fix some antique example output
      docs: make sure literal "->" isn't converted to arrow
      docs: update status --porcelain format
      docs: minor grammar fixes to git-status
    gitster committed May 31, 2011
  10. @gitster

    Merge branch 'jk/read-in-full-stops-on-error'

    * jk/read-in-full-stops-on-error:
      read_in_full: always report errors
    gitster committed May 31, 2011
  11. @gitster

    Merge branch 'jk/maint-remote-mirror-safer'

    * jk/maint-remote-mirror-safer:
      remote: allow "-t" with fetch mirrors
    gitster committed May 31, 2011
  12. @gitster

    Merge branch 'jl/read-tree-m-dry-run'

    * jl/read-tree-m-dry-run:
      Teach read-tree the -n|--dry-run option
      unpack-trees: add the dry_run flag to unpack_trees_options
    gitster committed May 31, 2011
  13. @gitster

    Sync with maint

    gitster committed May 31, 2011
  14. @gitster

    Start 1.7.5.4 draft release notes

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed May 31, 2011
  15. @gitster

    Merge branch 'tr/add-i-no-escape' into maint

    * tr/add-i-no-escape:
      add -i: ignore terminal escape sequences
    gitster committed May 31, 2011
  16. @gitster

    Merge branch 'vh/config-interactive-singlekey-doc' into maint

    * vh/config-interactive-singlekey-doc:
      git-reset.txt: better docs for '--patch'
      git-checkout.txt: better docs for '--patch'
      git-stash.txt: better docs for '--patch'
      git-add.txt: document 'interactive.singlekey'
      config.txt: 'interactive.singlekey; is used by...
    gitster committed May 31, 2011
  17. @gitster

    Merge branch 'ml/test-readme' into maint

    * ml/test-readme:
      t/README: unify documentation of test function args
    gitster committed May 31, 2011
  18. @gitster

    Merge branch 'ab/i18n-fixup' into maint

    * ab/i18n-fixup: (24 commits)
      i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811
      i18n: use test_i18n{grep,cmp} in t7508
      i18n: use test_i18ngrep in t7506
      i18n: use test_i18ngrep and test_i18ncmp in t7502
      i18n: use test_i18ngrep in t7501
      i18n: use test_i18ncmp in t7500
      i18n: use test_i18ngrep in t7201
      i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110
      i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012 and t7060
      i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014
      i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507
      i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200
      i18n: use test_i18ngrep in lib-httpd and t2019
      i18n: do not overuse C_LOCALE_OUTPUT (grep)
      i18n: use test_i18ncmp in t1200 and t2200
      i18n: .git file is not a human readable message (t5601)
      i18n: do not overuse C_LOCALE_OUTPUT
      i18n: mark init-db messages for translation
      i18n: mark checkout plural warning for translation
      i18n: mark checkout --detach messages for translation
      ...
    gitster committed May 31, 2011
  19. @gitster

    Merge branch 'jc/rename-degrade-cc-to-c' into maint

    * jc/rename-degrade-cc-to-c:
      diffcore-rename: fall back to -C when -C -C busts the rename limit
      diffcore-rename: record filepair for rename src
      diffcore-rename: refactor "too many candidates" logic
      builtin/diff.c: remove duplicated call to diff_result_code()
    gitster committed May 31, 2011
  20. @gitster

    Merge branch 'rr/doc-content-type' into maint

    * rr/doc-content-type:
      Documentation: Allow custom diff tools to be specified in 'diff.tool'
      Documentation: Add diff.<driver>.* to config
      Documentation: Move diff.<driver>.* from config.txt to diff-config.txt
      Documentation: Add filter.<driver>.* to config
    gitster committed May 31, 2011
  21. @gitster

    config.c: Remove unused git_config_global() function

    Commit 8f323c0 (drop support for GIT_CONFIG_NOGLOBAL, 15-03-2011)
    removed the git_config_global() function, among other things, since
    it is no longer required. Unfortunately, this function has since
    been unintentionally restored by a faulty conflict resolution.
    
    Remove it.
    
    Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    Ramsay Jones committed with gitster May 31, 2011
  22. @gitster

    Merge branch 'jc/fmt-req-fix'

    * jc/fmt-req-fix:
      userformat_find_requirements(): find requirement for the correct format
    gitster committed May 30, 2011
  23. @gitster

    Merge branch 'jk/maint-config-alias-fix'

    * jk/maint-config-alias-fix:
      handle_options(): do not miscount how many arguments were used
      config: always parse GIT_CONFIG_PARAMETERS during git_config
      git_config: don't peek at global config_parameters
      config: make environment parsing routines static
    
    Conflicts:
    	config.c
    gitster committed May 30, 2011
Commits on May 30, 2011
  1. @jrn @gitster

    Documentation: do not misinterpret refspecs as bold text

    In v1.7.3.3~2 (Documentation: do not misinterpret pull refspec as bold
    text, 2010-12-03) many uses of asterisks in expressions like
    "refs/heads/*:refs/svn/origin/branches/*" were escaped as {asterisk}
    to avoid being treated as delimiters for bold text, but these two were
    missed.
    
    Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    jrn committed with gitster May 30, 2011
  2. @peff @gitster

    format-patch: make zero-length subject prefixes prettier

    If you give a zero-length subject prefix to format-patch
    (e.g., "format-patch --subject-prefix="), we will print the
    ugly:
    
      Subject: [ 1/2] your subject here
    
    because we always insert a space between the prefix and
    numbering. Requiring the user to provide the space in their
    prefix would be more flexible, but would break existing
    usage. This patch provides a DWIM and suppresses the space
    for zero-length prefixes, under the assumption that nobody
    actually wants "[ 1/2]".
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster May 30, 2011
  3. @avar @gitster

    git-sh-i18n--envsubst: add SYNOPSIS section to the documentation

    Change the documentation for the git-sh-i18n--envsubst program to
    include a SYNOPSIS section. Include the invocation of the program from
    git-sh-i18n.sh.
    
    Not having a SYNOPSIS section caused the "doc" target to fail on
    Centos 5.5 with asciidoc 8.2.5, while building with 8.6.4 on Debian
    works just fine.
    
    The relevant error was:
    
        ERROR: git-sh-i18n--envsubst.txt: line 9: second section must be named SYNOPSIS
    
    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    avar committed with gitster May 29, 2011
  4. @gitster

    Merge branch 'maint'

    * maint:
      git-submodule.sh: separate parens by a space to avoid confusing some shells
      Documentation/technical/api-diff.txt: correct name of diff_unmerge()
      read_gitfile_gently: use ssize_t to hold read result
      remove tests of always-false condition
      rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0'
    gitster committed May 30, 2011
Something went wrong with that request. Please try again.