Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: next

Apr 18, 2014

  1. Junio C Hamano

    Merge branch 'master' into next

    * master:
      Git 2.0-rc0
    authored April 18, 2014
  2. Junio C Hamano

    Merge branch 'jx/i18n' into next

    * jx/i18n:
      i18n: mention "TRANSLATORS:" marker in Documentation/CodingGuidelines
      i18n: only extract comments marked with "TRANSLATORS:"
      i18n: remove obsolete comments for translators in diffstat generation
      i18n: fix uncatchable comments for translators in date.c
    authored April 18, 2014
  3. Junio C Hamano

    Merge branch 'km/avoid-non-function-return-in-rebase' into next

    Work around /bin/sh that does not like "return" at the top-level
    of a file that is dot-sourced from inside a function definition.
    
    * km/avoid-non-function-return-in-rebase:
      Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"
      rebase: avoid non-function use of "return" on FreeBSD
    authored April 18, 2014
  4. Junio C Hamano

    Merge branch 'ep/shell-command-substitution' into next

    * ep/shell-command-substitution:
      t9362-mw-to-git-utf8.sh: use the $( ... ) construct for command substitution
      t9360-mw-to-git-clone.sh: use the $( ... ) construct for command substitution
      git-tag.sh: use the $( ... ) construct for command substitution
      git-revert.sh: use the $( ... ) construct for command substitution
      git-resolve.sh: use the $( ... ) construct for command substitution
      git-repack.sh: use the $( ... ) construct for command substitution
      git-merge.sh: use the $( ... ) construct for command substitution
      git-ls-remote.sh: use the $( ... ) construct for command substitution
      git-fetch.sh: use the $( ... ) construct for command substitution
      git-commit.sh: use the $( ... ) construct for command substitution
      git-clone.sh: use the $( ... ) construct for command substitution
      git-checkout.sh: use the $( ... ) construct for command substitution
      install-webdoc.sh: use the $( ... ) construct for command substitution
      howto-index.sh: use the $( ... ) construct for command substitution
    authored April 18, 2014
  5. Junio C Hamano

    Git 2.0-rc0

    An early-preview for the upcoming Git 2.0.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 18, 2014
  6. Junio C Hamano

    Merge branch 'jk/config-die-bad-number-noreturn'

    Squelch a false compiler warning from older gcc.
    
    * jk/config-die-bad-number-noreturn:
      config.c: mark die_bad_number as NORETURN
    authored April 18, 2014
  7. Junio C Hamano

    Merge branch 'fc/remote-helper-fixes'

    * fc/remote-helper-fixes:
      remote-bzr: trivial test fix
      remote-bzr: include authors field in pushed commits
      remote-bzr: add support for older versions
      remote-hg: always normalize paths
      remote-helpers: allow all tests running from any dir
    authored April 18, 2014
  8. Junio C Hamano

    Merge branch 'fc/complete-aliased-push'

    * fc/complete-aliased-push:
      completion: fix completing args of aliased "push", "fetch", etc.
    authored April 18, 2014
  9. Junio C Hamano

    Merge branch 'fc/prompt-zsh-read-from-file'

    * fc/prompt-zsh-read-from-file:
      prompt: fix missing file errors in zsh
    authored April 18, 2014
  10. Junio C Hamano

    i18n: mention "TRANSLATORS:" marker in Documentation/CodingGuidelines

    These comments have to have "TRANSLATORS: " at the very beginning
    and have to deviate from the usual multi-line comment formatting
    convention.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 18, 2014

Apr 17, 2014

  1. t9362-mw-to-git-utf8.sh: use the $( ... ) construct for command subst…

    …itution
    
    The Git CodingGuidelines prefer the $(...) construct for command
    substitution instead of using the backquotes `...`.
    
    The backquoted form is the traditional method for command
    substitution, and is supported by POSIX.  However, all but the
    simplest uses become complicated quickly.  In particular, embedded
    command substitutions and/or the use of double quotes require
    careful escaping with the backslash character.
    
    The patch was generated by:
    
    for _f in $(find . -name "*.sh")
    do
       sed -i 's@`\(.*\)`@$(\1)@g' ${_f}
    done
    
    and then carefully proof-read.
    
    Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
    Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 16, 2014 gitster committed April 17, 2014
  2. t9360-mw-to-git-clone.sh: use the $( ... ) construct for command subs…

    …titution
    
    The Git CodingGuidelines prefer the $(...) construct for command
    substitution instead of using the backquotes `...`.
    
    The backquoted form is the traditional method for command
    substitution, and is supported by POSIX.  However, all but the
    simplest uses become complicated quickly.  In particular, embedded
    command substitutions and/or the use of double quotes require
    careful escaping with the backslash character.
    
    The patch was generated by:
    
    for _f in $(find . -name "*.sh")
    do
       sed -i 's@`\(.*\)`@$(\1)@g' ${_f}
    done
    
    and then carefully proof-read.
    
    Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
    Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 16, 2014 gitster committed April 17, 2014
  3. git-tag.sh: use the $( ... ) construct for command substitution

    The Git CodingGuidelines prefer the $(...) construct for command
    substitution instead of using the backquotes `...`.
    
    The backquoted form is the traditional method for command
    substitution, and is supported by POSIX.  However, all but the
    simplest uses become complicated quickly.  In particular, embedded
    command substitutions and/or the use of double quotes require
    careful escaping with the backslash character.
    
    The patch was generated by:
    
    for _f in $(find . -name "*.sh")
    do
       sed -i 's@`\(.*\)`@$(\1)@g' ${_f}
    done
    
    and then carefully proof-read.
    
    Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
    Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 16, 2014 gitster committed April 17, 2014
  4. git-revert.sh: use the $( ... ) construct for command substitution

    The Git CodingGuidelines prefer the $(...) construct for command
    substitution instead of using the backquotes `...`.
    
    The backquoted form is the traditional method for command
    substitution, and is supported by POSIX.  However, all but the
    simplest uses become complicated quickly.  In particular, embedded
    command substitutions and/or the use of double quotes require
    careful escaping with the backslash character.
    
    The patch was generated by:
    
    for _f in $(find . -name "*.sh")
    do
       sed -i 's@`\(.*\)`@$(\1)@g' ${_f}
    done
    
    and then carefully proof-read.
    
    Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
    Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 16, 2014 gitster committed April 17, 2014
  5. git-resolve.sh: use the $( ... ) construct for command substitution

    The Git CodingGuidelines prefer the $(...) construct for command
    substitution instead of using the backquotes `...`.
    
    The backquoted form is the traditional method for command
    substitution, and is supported by POSIX.  However, all but the
    simplest uses become complicated quickly.  In particular, embedded
    command substitutions and/or the use of double quotes require
    careful escaping with the backslash character.
    
    The patch was generated by:
    
    for _f in $(find . -name "*.sh")
    do
       sed -i 's@`\(.*\)`@$(\1)@g' ${_f}
    done
    
    and then carefully proof-read.
    
    Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
    Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 16, 2014 gitster committed April 17, 2014
  6. git-repack.sh: use the $( ... ) construct for command substitution

    The Git CodingGuidelines prefer the $(...) construct for command
    substitution instead of using the backquotes `...`.
    
    The backquoted form is the traditional method for command
    substitution, and is supported by POSIX.  However, all but the
    simplest uses become complicated quickly.  In particular, embedded
    command substitutions and/or the use of double quotes require
    careful escaping with the backslash character.
    
    The patch was generated by:
    
    for _f in $(find . -name "*.sh")
    do
       sed -i 's@`\(.*\)`@$(\1)@g' ${_f}
    done
    
    and then carefully proof-read.
    
    Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
    Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 16, 2014 gitster committed April 17, 2014
  7. git-merge.sh: use the $( ... ) construct for command substitution

    The Git CodingGuidelines prefer the $(...) construct for command
    substitution instead of using the backquotes `...`.
    
    The backquoted form is the traditional method for command
    substitution, and is supported by POSIX.  However, all but the
    simplest uses become complicated quickly.  In particular, embedded
    command substitutions and/or the use of double quotes require
    careful escaping with the backslash character.
    
    The patch was generated by:
    
    for _f in $(find . -name "*.sh")
    do
       sed -i 's@`\(.*\)`@$(\1)@g' ${_f}
    done
    
    and then carefully proof-read.
    
    Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
    Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 16, 2014 gitster committed April 17, 2014
  8. git-ls-remote.sh: use the $( ... ) construct for command substitution

    The Git CodingGuidelines prefer the $(...) construct for command
    substitution instead of using the backquotes `...`.
    
    The backquoted form is the traditional method for command
    substitution, and is supported by POSIX.  However, all but the
    simplest uses become complicated quickly.  In particular, embedded
    command substitutions and/or the use of double quotes require
    careful escaping with the backslash character.
    
    The patch was generated by:
    
    for _f in $(find . -name "*.sh")
    do
       sed -i 's@`\(.*\)`@$(\1)@g' ${_f}
    done
    
    and then carefully proof-read.
    
    Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
    Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 16, 2014 gitster committed April 17, 2014
  9. git-fetch.sh: use the $( ... ) construct for command substitution

    The Git CodingGuidelines prefer the $(...) construct for command
    substitution instead of using the backquotes `...`.
    
    The backquoted form is the traditional method for command
    substitution, and is supported by POSIX.  However, all but the
    simplest uses become complicated quickly.  In particular, embedded
    command substitutions and/or the use of double quotes require
    careful escaping with the backslash character.
    
    The patch was generated by:
    
    for _f in $(find . -name "*.sh")
    do
       sed -i 's@`\(.*\)`@$(\1)@g' ${_f}
    done
    
    and then carefully proof-read.
    
    Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
    Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 16, 2014 gitster committed April 17, 2014
  10. git-commit.sh: use the $( ... ) construct for command substitution

    The Git CodingGuidelines prefer the $(...) construct for command
    substitution instead of using the backquotes `...`.
    
    The backquoted form is the traditional method for command
    substitution, and is supported by POSIX.  However, all but the
    simplest uses become complicated quickly.  In particular, embedded
    command substitutions and/or the use of double quotes require
    careful escaping with the backslash character.
    
    The patch was generated by:
    
    for _f in $(find . -name "*.sh")
    do
       sed -i 's@`\(.*\)`@$(\1)@g' ${_f}
    done
    
    and then carefully proof-read.
    
    Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
    Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 16, 2014 gitster committed April 17, 2014
  11. git-clone.sh: use the $( ... ) construct for command substitution

    The Git CodingGuidelines prefer the $(...) construct for command
    substitution instead of using the backquotes `...`.
    
    The backquoted form is the traditional method for command
    substitution, and is supported by POSIX.  However, all but the
    simplest uses become complicated quickly.  In particular, embedded
    command substitutions and/or the use of double quotes require
    careful escaping with the backslash character.
    
    The patch was generated by:
    
    for _f in $(find . -name "*.sh")
    do
       sed -i 's@`\(.*\)`@$(\1)@g' ${_f}
    done
    
    and then carefully proof-read.
    
    Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
    Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 16, 2014 gitster committed April 17, 2014
  12. git-checkout.sh: use the $( ... ) construct for command substitution

    The Git CodingGuidelines prefer the $(...) construct for command
    substitution instead of using the backquotes `...`.
    
    The backquoted form is the traditional method for command
    substitution, and is supported by POSIX.  However, all but the
    simplest uses become complicated quickly.  In particular, embedded
    command substitutions and/or the use of double quotes require
    careful escaping with the backslash character.
    
    The patch was generated by:
    
    for _f in $(find . -name "*.sh")
    do
       sed -i 's@`\(.*\)`@$(\1)@g' ${_f}
    done
    
    and then carefully proof-read.
    
    Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
    Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 16, 2014 gitster committed April 17, 2014
  13. install-webdoc.sh: use the $( ... ) construct for command substitution

    The Git CodingGuidelines prefer the $(...) construct for command
    substitution instead of using the backquotes `...`.
    
    The backquoted form is the traditional method for command
    substitution, and is supported by POSIX.  However, all but the
    simplest uses become complicated quickly.  In particular, embedded
    command substitutions and/or the use of double quotes require
    careful escaping with the backslash character.
    
    The patch was generated by:
    
    for _f in $(find . -name "*.sh")
    do
       sed -i 's@`\(.*\)`@$(\1)@g' ${_f}
    done
    
    and then carefully proof-read.
    
    Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
    Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 16, 2014 gitster committed April 17, 2014
  14. howto-index.sh: use the $( ... ) construct for command substitution

    The Git CodingGuidelines prefer the $(...) construct for command
    substitution instead of using the backquotes `...`.
    
    The backquoted form is the traditional method for command
    substitution, and is supported by POSIX.  However, all but the
    simplest uses become complicated quickly.  In particular, embedded
    command substitutions and/or the use of double quotes require
    careful escaping with the backslash character.
    
    The patch was generated by:
    
    for _f in $(find . -name "*.sh")
    do
       sed -i 's@`\(.*\)`@$(\1)@g' ${_f}
    done
    
    and then carefully proof-read.
    
    Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
    Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 16, 2014 gitster committed April 17, 2014
  15. Jiang Xin

    i18n: only extract comments marked with "TRANSLATORS:"

    When extract l10n messages, we use "--add-comments" option to keep
    comments right above the l10n messages for references.  But sometimes
    irrelevant comments are also extracted.  For example in the following
    code block, the comment in line 2 will be extracted as comment for the
    l10n message in line 3, but obviously it's wrong.
    
            { OPTION_CALLBACK, 0, "ignore-removal", &addremove_explicit,
              NULL /* takes no arguments */,
              N_("ignore paths removed in the working tree (same as
              --no-all)"),
              PARSE_OPT_NOARG, ignore_removal_cb },
    
    Since almost all comments for l10n translators are marked with the same
    prefix (tag): "TRANSLATORS:", it's safe to only extract comments with
    this special tag.  I.E. it's better to call xgettext as:
    
            xgettext --add-comments=TRANSLATORS: ...
    
    Also tweaks the multi-line comment in "init-db.c", to make it start with
    the proper tag, not "* TRANSLATORS:" (which has a star before the tag).
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 17, 2014 gitster committed April 17, 2014
  16. Jiang Xin

    i18n: remove obsolete comments for translators in diffstat generation

    Since we do not translate diffstat any more, remove the obsolete comments.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 17, 2014 gitster committed April 17, 2014
  17. Jiang Xin

    i18n: fix uncatchable comments for translators in date.c

    Comment for l10n translators can not be extracted by xgettext if it
    is not right above the l10n tag.  Moving the comment right before
    the l10n tag will fix this issue.
    
    Reported-by: Brian Gesiak <modocache@gmail.com>
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 17, 2014 gitster committed April 17, 2014
  18. mackyle

    Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD"

    This reverts commit 99855dd.
    
    The workaround 99855dd introduced to deal with problematic
    "return" statements in scripts run by "dot" commands located
    inside functions only handles one part of the problem.  The
    issue has now been addressed by not using "return" statements
    in this way in the git-rebase--*.sh scripts.
    
    This workaround is therefore no longer necessary, so clean
    up the code by reverting it.
    
    Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
    Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 11, 2014 gitster committed April 17, 2014
  19. mackyle

    rebase: avoid non-function use of "return" on FreeBSD

    Since a1549e1, 15d4bf2 and 01a1e64 (first appearing in v1.8.4)
    the git-rebase--*.sh scripts have used a "return" to stop execution
    of the dot-sourced file and return to the "dot" command that
    dot-sourced it.  The /bin/sh utility on FreeBSD however behaves
    poorly under some circumstances when such a "return" is executed.
    
    In particular, if the "dot" command is contained within a function,
    then when a "return" is executed by the script it runs (that is not
    itself inside a function), control will return from the function
    that contains the "dot" command skipping any statements that might
    follow the dot command inside that function.  Commit 99855dd (first
    appearing in v1.8.4.1) addresses this by making the "dot" command
    the last line in the function.
    
    Unfortunately the FreeBSD /bin/sh may also execute some statements
    in the script run by the "dot" command that appear after the
    troublesome "return".  The fix in 99855dd does not address this
    problem.
    
    For example, if you have script1.sh with these contents:
    
    run_script2() {
            . "$(dirname -- "$0")/script2.sh"
            _e=$?
            echo only this line should show
            [ $_e -eq 5 ] || echo expected status 5 got $_e
            return 3
    }
    run_script2
    e=$?
    [ $e -eq 3 ] || { echo expected status 3 got $e; exit 1; }
    
    And script2.sh with these contents:
    
    if [ 5 -gt 3 ]; then
            return 5
    fi
    case bad in *)
            echo always shows
    esac
    echo should not get here
    ! :
    
    When running script1.sh (e.g. '/bin/sh script1.sh' or './script1.sh'
    after making it executable), the expected output from a POSIX shell
    is simply the single line:
    
    only this line should show
    
    However, when run using FreeBSD's /bin/sh, the following output
    appears instead:
    
    should not get here
    expected status 3 got 1
    
    Not only did the lines following the "dot" command in the run_script2
    function in script1.sh get skipped, but additional lines in script2.sh
    following the "return" got executed -- but not all of them (e.g. the
    "echo always shows" line did not run).
    
    These issues can be avoided by not using a top-level "return" in
    script2.sh.  If script2.sh is changed to this:
    
    main() {
            if [ 5 -gt 3 ]; then
                    return 5
            fi
            case bad in *)
                    echo always shows
            esac
            echo should not get here
            ! :
    }
    main
    
    Then it behaves the same when using FreeBSD's /bin/sh as when using
    other more POSIX compliant /bin/sh implementations.
    
    We fix the git-rebase--*.sh scripts in a similar fashion by moving
    the top-level code that contains "return" statements into its own
    function and then calling that as the last line in the script.
    
    Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
    Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 11, 2014 gitster committed April 17, 2014

Apr 16, 2014

  1. Junio C Hamano

    Merge branch 'master' into next

    * master:
      Update draft release notes for 2.0
    authored April 16, 2014
  2. Junio C Hamano

    Merge branch 'nd/index-pack-one-fd-per-thread' into next

    Enable threaded index-pack on platforms without thread-unsafe
    pread() emulation.
    
    * nd/index-pack-one-fd-per-thread:
      index-pack: work around thread-unsafe pread()
    authored April 16, 2014
  3. Junio C Hamano

    Merge branch 'jk/config-die-bad-number-noreturn' into next

    * jk/config-die-bad-number-noreturn:
      config.c: mark die_bad_number as NORETURN
    authored April 16, 2014
  4. Junio C Hamano

    Merge branch 'db/make-with-curl' into next

    Ask curl-config how to link with the curl library, instead of
    having only a limited configurability knobs in the Makefile.
    
    * db/make-with-curl:
      Makefile: allow static linking against libcurl
      Makefile: use curl-config to determine curl flags
    authored April 16, 2014
  5. Junio C Hamano

    Merge branch 'fc/remote-helper-fixes' into next

    * fc/remote-helper-fixes:
      remote-bzr: trivial test fix
      remote-bzr: include authors field in pushed commits
      remote-bzr: add support for older versions
      remote-hg: always normalize paths
      remote-helpers: allow all tests running from any dir
    authored April 16, 2014
  6. Junio C Hamano

    Merge branch 'fc/prompt-zsh-read-from-file' into next

    * fc/prompt-zsh-read-from-file:
      prompt: fix missing file errors in zsh
    authored April 16, 2014
Something went wrong with that request. Please try again.