[DRE-commits] [ruby-rugged] 01/11: Merge tag 'upstream/0.21.4'

[Cédric Boutillier]

This is an automated email from the git hooks/post-receive script.

boutil pushed a commit to branch master
in repository ruby-rugged.

commit f46ee2608a1f9afffd60d37aa562ad7524ba4e59
Merge: 49c87af d11677b
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Apr 22 12:29:35 2015 +0200

    Merge tag 'upstream/0.21.4'
    
    Upstream version 0.21.4

 lib/rugged/version.rb                          |   2 +-
 metadata.yml                                   | 138 +++++------
 vendor/libgit2/include/git2.h                  |   1 +
 vendor/libgit2/include/git2/revert.h           |   2 +-
 vendor/libgit2/include/git2/sys/refs.h         |  11 +
 vendor/libgit2/include/git2/transport.h        |  22 +-
 vendor/libgit2/include/git2/tree.h             |   6 +-
 vendor/libgit2/include/git2/version.h          |   4 +-
 vendor/libgit2/src/array.h                     |   2 +-
 vendor/libgit2/src/attr_file.c                 |  26 +++
 vendor/libgit2/src/attr_file.h                 |   2 +
 vendor/libgit2/src/buf_text.c                  |  14 +-
 vendor/libgit2/src/buf_text.h                  |   5 +-
 vendor/libgit2/src/cc-compat.h                 |   8 +
 vendor/libgit2/src/checkout.c                  |  52 ++++-
 vendor/libgit2/src/config_cache.c              |   2 +
 vendor/libgit2/src/config_file.c               |  17 +-
 vendor/libgit2/src/crlf.c                      |   3 +-
 vendor/libgit2/src/diff_patch.c                |   1 +
 vendor/libgit2/src/filebuf.c                   |   2 +
 vendor/libgit2/src/filter.c                    |  13 +-
 vendor/libgit2/src/global.c                    |  39 +++-
 vendor/libgit2/src/ignore.c                    |  89 +++++++-
 vendor/libgit2/src/index.c                     | 126 ++++++----
 vendor/libgit2/src/indexer.c                   |  16 +-
 vendor/libgit2/src/merge.c                     |  14 +-
 vendor/libgit2/src/mwindow.c                   | 125 +---------
 vendor/libgit2/src/mwindow.h                   |  10 +-
 vendor/libgit2/src/netops.c                    |   5 +-
 vendor/libgit2/src/odb_pack.c                  |   9 +-
 vendor/libgit2/src/pack.c                      |  27 +--
 vendor/libgit2/src/pack.h                      |   3 -
 vendor/libgit2/src/path.c                      | 298 ++++++++++++++++++++++--
 vendor/libgit2/src/path.h                      |  44 ++++
 vendor/libgit2/src/pool.c                      |   4 +-
 vendor/libgit2/src/refdb_fs.c                  |  12 +-
 vendor/libgit2/src/refspec.c                   |  60 +++--
 vendor/libgit2/src/remote.c                    |  15 +-
 vendor/libgit2/src/repository.c                |  29 ++-
 vendor/libgit2/src/repository.h                |  26 ++-
 vendor/libgit2/src/revwalk.c                   |   3 -
 vendor/libgit2/src/stash.c                     |   8 +-
 vendor/libgit2/src/tag.c                       |   5 +-
 vendor/libgit2/src/transports/http.c           |  24 +-
 vendor/libgit2/src/transports/smart_protocol.c |   4 +-
 vendor/libgit2/src/transports/ssh.c            |  27 ++-
 vendor/libgit2/src/tree.c                      | 126 +++++-----
 vendor/libgit2/src/tree.h                      |   5 +-
 vendor/libgit2/src/unix/map.c                  |   6 +-
 vendor/libgit2/src/util.c                      |  91 ++++++++
 vendor/libgit2/src/util.h                      |  12 +
 vendor/libgit2/src/win32/findfile.c            |   1 +
 vendor/libgit2/src/win32/path_w32.c            | 305 +++++++++++++++++++++++++
 vendor/libgit2/src/win32/path_w32.h            |  82 +++++++
 vendor/libgit2/src/win32/posix.h               |   1 +
 vendor/libgit2/src/win32/posix_w32.c           | 110 ++++-----
 vendor/libgit2/src/win32/utf-conv.c            |  42 +++-
 vendor/libgit2/src/win32/utf-conv.h            |  39 ----
 vendor/libgit2/src/win32/w32_util.h            |   1 +
 59 files changed, 1594 insertions(+), 582 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-rugged.git