Permalink
Commits on Dec 5, 2016
  1. Start post 2.11 cycle

    For now, let's call it 2.12 tentatively.
    
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 5, 2016
  2. Sync with maint-2.10

    * maint-2.10:
      preparing for 2.10.3
    gitster committed Dec 5, 2016
  3. preparing for 2.10.3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Dec 5, 2016
  4. Merge branch 'jk/common-main' into maint-2.10

    * jk/common-main:
      common-main: stop munging argv[0] path
      git-compat-util: move content inside ifdef/endif guards
    gitster committed Dec 5, 2016
Commits on Nov 29, 2016
  1. Merge branch 'tk/diffcore-delta-remove-unused' into maint

    Code cleanup.
    
    * tk/diffcore-delta-remove-unused:
      diffcore-delta: remove unused parameter to diffcore_count_changes()
    gitster committed Nov 29, 2016
  2. Merge branch 'jk/create-branch-remove-unused-param' into maint

    Code clean-up.
    
    * jk/create-branch-remove-unused-param:
      create_branch: drop unused "head" parameter
    gitster committed Nov 29, 2016
  3. Merge branch 'nd/worktree-lock' into maint

    Typofix.
    
    * nd/worktree-lock:
      git-worktree.txt: fix typo "to"/"two", and add comma
    gitster committed Nov 29, 2016
  4. Merge branch 'ps/common-info-doc' into maint

    Doc fix.
    
    * ps/common-info-doc:
      doc: fix location of 'info/' with $GIT_COMMON_DIR
    gitster committed Nov 29, 2016
  5. Merge branch 'rs/cocci' into maint

    Improve the rule to convert "unsigned char [20]" into "struct
    object_id *" in contrib/coccinelle/
    
    * rs/cocci:
      cocci: avoid self-references in object_id transformations
    gitster committed Nov 29, 2016
  6. Merge branch 'nd/test-helpers' into maint

    Update to the test framework made in 2.9 timeframe broke running
    the tests under valgrind, which has been fixed.
    
    * nd/test-helpers:
      valgrind: support test helpers
    gitster committed Nov 29, 2016
  7. Merge branch 'sc/fmt-merge-msg-doc-markup-fix' into maint

    Documentation fix.
    
    * sc/fmt-merge-msg-doc-markup-fix:
      Documentation/fmt-merge-msg: fix markup in example
    gitster committed Nov 29, 2016
  8. Merge branch 'rs/commit-pptr-simplify' into maint

    Code simplification.
    
    * rs/commit-pptr-simplify:
      commit: simplify building parents list
    gitster committed Nov 29, 2016
  9. Merge branch 'jk/rebase-config-insn-fmt-docfix' into maint

    Documentation fix.
    
    * jk/rebase-config-insn-fmt-docfix:
      doc: fix missing "::" in config list
    gitster committed Nov 29, 2016
  10. Merge branch 'ak/pre-receive-hook-template-modefix' into maint

    A trivial clean-up to a recently graduated topic.
    
    * ak/pre-receive-hook-template-modefix:
      pre-receive.sample: mark it executable
    gitster committed Nov 29, 2016
  11. Merge branch 'ls/macos-update' into maint

    Portability update and workaround for builds on recent Mac OS X.
    
    * ls/macos-update:
      travis-ci: disable GIT_TEST_HTTPD for macOS
      Makefile: set NO_OPENSSL on macOS by default
    gitster committed Nov 29, 2016
  12. Merge branch 'as/merge-attr-sleep' into maint

    Fix for a racy false-positive test failure.
    
    * as/merge-attr-sleep:
      t6026: clarify the point of "kill $(cat sleep.pid)"
      t6026: ensure that long-running script really is
      Revert "t6026-merge-attr: don't fail if sleep exits early"
      Revert "t6026-merge-attr: ensure that the merge driver was called"
      t6026-merge-attr: ensure that the merge driver was called
      t6026-merge-attr: don't fail if sleep exits early
    gitster committed Nov 29, 2016
  13. Merge branch 'ak/sh-setup-dot-source-i18n-fix' into maint

    Recent update to git-sh-setup (a library of shell functions that
    are used by our in-tree scripted Porcelain commands) included
    another shell library git-sh-i18n without specifying where it is,
    relying on the $PATH.  This has been fixed to be more explicit by
    prefixing $(git --exec-path) output in front.
    
    * ak/sh-setup-dot-source-i18n-fix:
      git-sh-setup: be explicit where to dot-source git-sh-i18n from.
    gitster committed Nov 29, 2016
  14. Merge branch 'jk/daemon-path-ok-check-truncation' into maint

    "git daemon" used fixed-length buffers to turn URL to the
    repository the client asked for into the server side directory
    path, using snprintf() to avoid overflowing these buffers, but
    allowed possibly truncated paths to the directory.  This has been
    tightened to reject such a request that causes overlong path to be
    required to serve.
    
    * jk/daemon-path-ok-check-truncation:
      daemon: detect and reject too-long paths
    gitster committed Nov 29, 2016
  15. Merge branch 'rs/ring-buffer-wraparound' into maint

    The code that we have used for the past 10+ years to cycle
    4-element ring buffers turns out to be not quite portable in
    theoretical world.
    
    * rs/ring-buffer-wraparound:
      hex: make wraparound of the index into ring-buffer explicit
    gitster committed Nov 29, 2016
  16. Merge branch 'mm/send-email-cc-cruft-after-address' into maint

    "git send-email" attempts to pick up valid e-mails from the
    trailers, but people in real world write non-addresses there, like
    "Cc: Stable <add@re.ss> # 4.8+", which broke the output depending
    on the availability and vintage of Mail::Address perl module.
    
    * mm/send-email-cc-cruft-after-address:
      Git.pm: add comment pointing to t9000
      t9000-addresses: update expected results after fix
      parse_mailboxes: accept extra text after <...> address
    gitster committed Nov 29, 2016
  17. Merge branch 'cp/completion-negative-refs' into maint

    The command-line completion script (in contrib/) learned to
    complete "git cmd ^mas<HT>" to complete the negative end of
    reference to "git cmd ^master".
    
    * cp/completion-negative-refs:
      completion: support excluding refs
    gitster committed Nov 29, 2016
  18. Merge branch 'jc/am-read-author-file' into maint

    Extract a small helper out of the function that reads the authors
    script file "git am" internally uses.
    This by itself is not useful until a second caller appears in the
    future for "rebase -i" helper.
    
    * jc/am-read-author-file:
      am: refactor read_author_script()
    gitster committed Nov 29, 2016
  19. Git 2.11

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Nov 29, 2016
  20. Merge branch 'jk/common-main'

    Fix for a small regression in a topic already in 'master'.
    
    * jk/common-main:
      common-main: stop munging argv[0] path
    gitster committed Nov 29, 2016
  21. Merge tag 'l10n-2.11.0-rnd3.1' of git://github.com/git-l10n/git-po

    l10n-2.11.0-rnd3.1: update ru and ca translations
    
    * tag 'l10n-2.11.0-rnd3.1' of git://github.com/git-l10n/git-po:
      l10n: ru.po: update Russian translation
      l10n: ca.po: update translation
    gitster committed Nov 29, 2016
  22. common-main: stop munging argv[0] path

    Since 650c449 (common-main: call git_extract_argv0_path(),
    2016-07-01), the argv[0] that is seen in cmd_main() of
    individual programs is always the basename of the
    executable, as common-main strips off the full path. This
    can produce confusing results for git-daemon, which wants to
    re-exec itself.
    
    For instance, if the program was originally run as
    "/usr/lib/git/git-daemon", it will try just re-execing
    "git-daemon", which will find the first instance in $PATH.
    If git's exec-path has not been prepended to $PATH, we may
    find the git-daemon from a different version (or no
    git-daemon at all).
    
    Normally this isn't a problem. Git commands are run as "git
    daemon", the git wrapper puts the exec-path at the front of
    $PATH, and argv[0] is already "daemon" anyway. But running
    git-daemon via its full exec-path, while not really a
    recommended method, did work prior to 650c449. Let's make
    it work again.
    
    The real goal of 650c449 was not to munge argv[0], but to
    reliably set the argv0_path global. The only reason it
    munges at all is that one caller, the git.c wrapper,
    piggy-backed on that computation to find the command
    basename.  Instead, let's leave argv[0] untouched in
    common-main, and have git.c do its own basename computation.
    
    While we're at it, let's drop the return value from
    git_extract_argv0_path(). It was only ever used in this one
    callsite, and its dual purposes is what led to this
    confusion in the first place.
    
    Note that by changing the interface, the compiler can
    confirm for us that there are no other callers storing the
    return value. But the compiler can't tell us whether any of
    the cmd_main() functions (besides git.c) were relying on the
    basename munging. However, we can observe that prior to
    650c449, no other cmd_main() functions did that munging,
    and no new cmd_main() functions have been introduced since
    then. So we can't be regressing any of those cases.
    
    Signed-off-by: Jeff King <peff@peff.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    peff committed with gitster Nov 27, 2016
  23. Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ru

    * 'russian-l10n' of https://github.com/DJm00n/git-po-ru:
      l10n: ru.po: update Russian translation
    jiangxin committed Nov 29, 2016
  24. l10n: ru.po: update Russian translation

    Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
    DJm00n committed Nov 29, 2016
  25. l10n: ca.po: update translation

    Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
    alexhenrie committed Nov 29, 2016
Commits on Nov 28, 2016
  1. RelNotes: spelling and phrasing fixups

    Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    marcnarc committed with gitster Nov 24, 2016
  2. Merge tag 'l10n-2.11.0-rnd3' of git://github.com/git-l10n/git-po

    l10n-2.11.0-rnd3
    
    * tag 'l10n-2.11.0-rnd3' of git://github.com/git-l10n/git-po:
      l10n: de.po: translate 210 new messages
      l10n: fix unmatched single quote in error message
    gitster committed Nov 28, 2016
  3. l10n: de.po: translate 210 new messages

    Translate 210 new messages came from git.pot update in fda7b09
    (l10n: git.pot: v2.11.0 round 1 (209 new, 53 removed)) and c091ffb
    (l10n: git.pot: v2.11.0 round 2 (1 new, 1 removed)).
    
    Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
    ralfth committed Nov 2, 2016
Commits on Nov 25, 2016
  1. l10n: fix unmatched single quote in error message

    Translate one message introduced by commit:
    
     * 3587180 i18n: fix unmatched single quote in error message
    
    Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
    jiangxin committed Nov 20, 2016
Commits on Nov 23, 2016
  1. Git 2.11-rc3

    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    gitster committed Nov 23, 2016
  2. Merge branch 'jc/setup-cleanup-fix'

    "git archive" and "git mailinfo" stopped reading from local
    configuration file with a recent update.
    
    * jc/setup-cleanup-fix:
      archive: read local configuration
      mailinfo: read local configuration
    gitster committed Nov 23, 2016