1. 21 Dec, 2015 1 commit
  2. 14 Dec, 2015 1 commit
  3. 11 Dec, 2015 16 commits
  4. 10 Dec, 2015 8 commits
  5. 08 Dec, 2015 10 commits
    • Junio C Hamano's avatar
      Merge branch 'ep/ident-with-getaddrinfo' · 545299f8
      Junio C Hamano authored
      A build without NO_IPv6 used to use gethostbyname() when guessing
      user's hostname, instead of getaddrinfo() that is used in other
      codepaths in such a build.
      
      * ep/ident-with-getaddrinfo:
        ident.c: add support for IPv6
      545299f8
    • Junio C Hamano's avatar
      Merge branch 'ls/test-must-fail-sigpipe' · 2b597f33
      Junio C Hamano authored
      Fix some racy client/server tests by treating SIGPIPE the same as a
      normal non-zero exit.
      
      * ls/test-must-fail-sigpipe:
        add "ok=sigpipe" to test_must_fail and use it to fix flaky tests
        implement test_might_fail using a refactored test_must_fail
      2b597f33
    • Junio C Hamano's avatar
      Merge branch 'dt/refs-backend-pre-vtable' · b1cda70f
      Junio C Hamano authored
      Code preparation for pluggable ref backends.
      
      * dt/refs-backend-pre-vtable:
        refs: break out ref conflict checks
        files_log_ref_write: new function
        initdb: make safe_create_dir public
        refs: split filesystem-based refs code into a new file
        refs/refs-internal.h: new header file
        refname_is_safe(): improve docstring
        pack_if_possible_fn(): use ref_type() instead of is_per_worktree_ref()
        copy_msg(): rename to copy_reflog_msg()
        verify_refname_available(): new function
        verify_refname_available(): rename function
      b1cda70f
    • Junio C Hamano's avatar
      Sync with 2.6.4 · fa5f2398
      Junio C Hamano authored
      fa5f2398
    • Junio C Hamano's avatar
      Git 2.6.4 · bdfc6b36
      Junio C Hamano authored
      Signed-off-by: default avatarJunio C Hamano <[email protected]>
      bdfc6b36
    • Junio C Hamano's avatar
      Merge branch 'rs/status-detached-head-memcmp' into maint · 4d0069f2
      Junio C Hamano authored
      Fix some string-matching corner cases when digging in the reflog for
      "git status".
      
      * rs/status-detached-head-memcmp:
        wt-status: correct and simplify check for detached HEAD
      4d0069f2
    • Junio C Hamano's avatar
      Merge branch 'ad/sha1-update-chunked' into maint · b5d2d8ee
      Junio C Hamano authored
      Apple's common crypto implementation of SHA1_Update() does not take
      more than 4GB at a time, and we now have a compile-time workaround
      for it.
      
      * ad/sha1-update-chunked:
        sha1: allow limiting the size of the data passed to SHA1_Update()
        sha1: provide another level of indirection for the SHA-1 functions
      b5d2d8ee
    • Junio C Hamano's avatar
      Merge branch 'sg/bash-prompt-dirty-orphan' into maint · e6ed5a43
      Junio C Hamano authored
      Produce correct "dirty" marker for shell prompts, even when we
      are on an orphan or an unborn branch.
      
      * sg/bash-prompt-dirty-orphan:
        bash prompt: indicate dirty index even on orphan branches
        bash prompt: remove a redundant 'git diff' option
        bash prompt: test dirty index and worktree while on an orphan branch
      e6ed5a43
    • Junio C Hamano's avatar
      Merge branch 'jk/interpret-trailers-outside-a-repository' into maint · 22386ad6
      Junio C Hamano authored
      Allow "git interpret-trailers" to run outside of a Git repository.
      
      * jk/interpret-trailers-outside-a-repository:
        interpret-trailers: allow running outside a repository
      22386ad6
    • Junio C Hamano's avatar
      Merge branch 'jk/rebase-no-autostash' into maint · 697bd287
      Junio C Hamano authored
      There was no way to defeat a configured rebase.autostash variable
      from the command line, as "git rebase --no-autostash" was missing.
      
      * jk/rebase-no-autostash:
        Documentation/git-rebase: fix --no-autostash formatting
        rebase: support --no-autostash
      697bd287
  6. 07 Dec, 2015 1 commit
  7. 04 Dec, 2015 3 commits