Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master

Apr 23, 2014

  1. Jiang Xin

    l10n: zh_CN.po: translate 46 new messages (2229t0f0u)

    Translations for git v2.0.0-rc0.  Also correct translatioins on relative
    date in date.c with help from Brian Gesiak ($gmane/246390).
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    authored March 13, 2014
  2. Jiang Xin

    Merge branch 'fr-po' of git://github.com/jnavila/git

    * 'fr-po' of git://github.com/jnavila/git:
      l10n: fr translation for v2.0.0rc0 (2228t)
    authored April 23, 2014

Apr 22, 2014

  1. Jean-Noël Avila

    l10n: fr translation for v2.0.0rc0 (2228t)

    Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
    Signed-off-by: Matthieu Baerts <matttbe@gmail.com>
    Signed-off-by: Xavier Mehrenberger <xavier.mehrenberger@gmail.com>
    authored February 26, 2014
  2. Peter Krefting

    l10n: Update Swedish translation (2228t0f0u)

    Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
    authored April 22, 2014

Apr 20, 2014

  1. Trần Ngọc Quân

    l10n: vi.po (2228t): Update and minor fix

    Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
    authored April 20, 2014

Apr 19, 2014

  1. Jiang Xin

    l10n: git.pot: v2.0.0 round 1 (45 new, 28 removed)

    Generate po/git.pot from v2.0.0-rc0 for git v2.0.0 l10n round 1.
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    authored April 19, 2014

Apr 18, 2014

  1. 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
  2. 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
  3. 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
  4. 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
  5. 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

Apr 16, 2014

  1. Junio C Hamano

    Update draft release notes for 2.0

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

    Merge branch 'mh/multimail'

    * mh/multimail:
      git-multimail: update to version 1.0.0
    authored April 16, 2014
  3. Junio C Hamano

    Merge branch 'tb/unicode-6.3-zero-width'

    Teach our display-column-counting logic about decomposed umlauts
    and friends.
    
    * tb/unicode-6.3-zero-width:
      utf8.c: partially update to version 6.3
    authored April 16, 2014
  4. Junio C Hamano

    Merge branch 'km/avoid-cp-a'

    Portability fix.
    
    * km/avoid-cp-a:
      test: fix t7001 cp to use POSIX options
    authored April 16, 2014
  5. Junio C Hamano

    Merge branch 'km/avoid-bs-in-shell-glob'

    Portability fix.
    
    * km/avoid-bs-in-shell-glob:
      test: fix t5560 on FreeBSD
    authored April 16, 2014
  6. Jeff King

    config.c: mark die_bad_number as NORETURN

    This can help avoid -Wuninitialized false positives in
    git_config_int and git_config_ulong, as the compiler now
    knows that we do not return "ret" if we hit the error
    codepath.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 16, 2014 gitster committed April 16, 2014

Apr 14, 2014

  1. Felipe Contreras

    prompt: fix missing file errors in zsh

    zsh seems to have a bug while redirecting the stderr of the 'read'
    command:
    
        % read foo 2>/dev/null <foo
        zsh: no such file or directory: foo
    
    Which causes errors to be displayed when certain files are missing.
    Let's add a convenience function to manually check if the file is
    readable before calling "read".
    
    Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 11, 2014 gitster committed April 14, 2014
  2. Felipe Contreras

    remote-bzr: trivial test fix

    So that the committer is reset properly.
    
    Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 11, 2014 gitster committed April 14, 2014

Apr 11, 2014

  1. mackyle

    test: fix t5560 on FreeBSD

    Since fd0a8c2 (first appearing in v1.7.0), the
    t/t5560-http-backend-noserver.sh test has used a backslash escape
    inside a ${} expansion in order to specify a literal '?' character.
    
    Unfortunately the FreeBSD /bin/sh does not interpret this correctly.
    
    In a POSIX compliant shell, the following:
    
    x='one?two?three'
    echo "${x#*\?}"
    
    Would be expected to produce this:
    
    two?three
    
    When using the FreeBSD /bin/sh instead you get this:
    
    one?two?three
    
    In fact the FreeBSD /bin/sh treats the backslash as a literal
    character to match so that this:
    
    y='one\two\three'
    echo "${y#*\?}"
    
    Produces this unexpected value:
    
    wo\three
    
    In this case the backslash is not only treated literally, it also
    fails to defeat the special meaning of the '?' character.
    
    Instead, we can use the [...] construct to defeat the special meaning
    of the '?' character and match it exactly in a way that works for the
    FreeBSD /bin/sh as well as other POSIX /bin/sh implementations.
    
    Changing the example like so:
    
    x='one?two?three'
    echo "${x#*[?]}"
    
    Produces the expected output using the FreeBSD /bin/sh.
    
    Therefore, change the use of \? to [?] in order to be compatible with
    the FreeBSD /bin/sh which allows t/t5560-http-backend-noserver.sh to
    pass on FreeBSD again.
    
    Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 11, 2014 gitster committed April 11, 2014
  2. mackyle

    test: fix t7001 cp to use POSIX options

    Since 1150246 and 04c1ee5 (both first appearing in v1.8.5), the
    t7001-mv test has used "cp -a" to perform a copy in several of the
    tests.
    
    However, the "-a" option is not required for a POSIX cp utility and
    some platforms' cp utilities do not support it.
    
    The POSIX equivalent of -a is -R -P -p.
    
    Change "cp -a" to "cp -R -P -p" so that the t7001-mv test works
    on systems with a cp utility that only implements the POSIX
    required set of options and not the "-a" option.
    
    Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 11, 2014 gitster committed April 11, 2014

Apr 09, 2014

  1. Felipe Contreras

    completion: fix completing args of aliased "push", "fetch", etc.

    Some commands need the first word to determine the actual action that is
    being executed, however, the command is wrong when we use an alias, for
    example 'alias.p=push', if we try to complete 'git p origin ', the
    result would be wrong because __git_complete_remote_or_refspec() doesn't
    know where it came from.
    
    So let's override words[1], so the alias 'p' is override by the actual
    command, 'push'.
    
    Reported-by: Aymeric Beaumet <aymeric.beaumet@gmail.com>
    Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 09, 2014 gitster committed April 09, 2014
  2. dx

    remote-bzr: include authors field in pushed commits

    Tests-by: Felipe Contreras <felipe.contreras@gmail.com>
    Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 09, 2014 gitster committed April 09, 2014
  3. Felipe Contreras

    remote-bzr: add support for older versions

    Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 09, 2014 gitster committed April 09, 2014
  4. Felipe Contreras

    remote-hg: always normalize paths

    Apparently Mercurial can have paths such as 'foo//bar', so normalize all
    paths.
    
    Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 09, 2014 gitster committed April 09, 2014
  5. Felipe Contreras

    remote-helpers: allow all tests running from any dir

    Commit d3243d7 (test-bzr.sh, test-hg.sh: allow running from any dir)
    allowed the tests to run from any directory, however, it didn't update
    all the tests.
    
    Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 09, 2014 gitster committed April 09, 2014
  6. Junio C Hamano

    Sync with 1.9.2

    * maint:
      Git 1.9.2
      doc/http-backend: missing accent grave in literal mark-up
    authored April 09, 2014
  7. Junio C Hamano

    Git 1.9.2

    The second maintenance release for Git 1.9; contains all the fixes
    that are scheduled to appear in Git 2.0.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 09, 2014
  8. Junio C Hamano

    Merge branch 'jl/nor-or-nand-and' into maint

    * jl/nor-or-nand-and:
      code and test: fix misuses of "nor"
      comments: fix misuses of "nor"
      contrib: fix misuses of "nor"
      Documentation: fix misuses of "nor"
    authored April 09, 2014
  9. Junio C Hamano

    Merge branch 'cn/fetch-prune-overlapping-destination' into maint

    * cn/fetch-prune-overlapping-destination:
      fetch: handle overlaping refspecs on --prune
      fetch: add a failing test for prunning with overlapping refspecs
    authored April 09, 2014
  10. Junio C Hamano

    Merge branch 'mh/update-ref-batch-create-fix' into maint

    * mh/update-ref-batch-create-fix:
      update-ref: fail create operation over stdin if ref already exists
    authored April 09, 2014
  11. Junio C Hamano

    Merge branch 'jk/commit-dates-parsing-fix' into maint

    * jk/commit-dates-parsing-fix:
      t4212: loosen far-in-future test for AIX
      date: recognize bogus FreeBSD gmtime output
    authored April 09, 2014
  12. Junio C Hamano

    Merge branch 'jc/fix-diff-no-index-diff-opt-parse' into maint

    * jc/fix-diff-no-index-diff-opt-parse:
      diff-no-index: correctly diagnose error return from diff_opt_parse()
    authored April 09, 2014
  13. Junio C Hamano

    Merge commit 'doc/http-backend: missing accent grave in literal mark-up'

    * commit '5df05146d5cb94628a3dfc53063c802ee1152cec':
      doc/http-backend: missing accent grave in literal mark-up
    authored April 09, 2014
  14. tacker66

    doc/http-backend: missing accent grave in literal mark-up

    Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    authored April 09, 2014 gitster committed April 09, 2014
Something went wrong with that request. Please try again.