Merge pull request #687 from libgit2/ethomson/update_libgit2

Update libgit2 to b31b236...

Author: Edward Thomson

ext/rugged/extconf.rb

@@ -12,6 +12,9 @@
 $CFLAGS << " -O3" unless $CFLAGS[/-O\d/]
 $CFLAGS << " -Wall -Wno-comment"
 
+cmake_flags = [ ENV["CMAKE_FLAGS"] ]
+cmake_flags << "-DUSE_SHA1DC=ON" if with_config("sha1dc")
+
 def sys(cmd)
   puts " -- #{cmd}"
   unless ret = xsystem(cmd)
@@ -77,7 +80,7 @@ def sys(cmd)
     Dir.chdir("build") do
       # On Windows, Ruby-DevKit is MSYS-based, so ensure to use MSYS Makefiles.
       generator = "-G \"MSYS Makefiles\"" if Gem.win_platform?
-      sys("cmake .. -DBUILD_CLAR=OFF -DTHREADSAFE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_C_FLAGS=-fPIC -DCMAKE_BUILD_TYPE=RelWithDebInfo #{generator}")
+      sys("cmake .. -DBUILD_CLAR=OFF -DTHREADSAFE=ON -DBUILD_SHARED_LIBS=OFF -DCMAKE_C_FLAGS=-fPIC -DCMAKE_BUILD_TYPE=RelWithDebInfo #{cmake_flags.join(' ')} #{generator}")
       sys(MAKE)
 
       # "normal" libraries (and libgit2 builds) get all these when they build but we're doing it

lib/rugged/version.rb

@@ -4,5 +4,5 @@
 # For full terms see the included LICENSE file.
 
 module Rugged
-  Version = VERSION = '0.26.0b3'
+  Version = VERSION = '0.26.0b5'
 end

test/reference_test.rb

@@ -29,10 +29,12 @@ def test_list_references
       "refs/heads/ident",
       "refs/heads/long-file-name",
       "refs/heads/master",
+      "refs/heads/merge-conflict",
       "refs/heads/packed",
       "refs/heads/packed-test",
       "refs/heads/subtrees",
       "refs/heads/test",
+      "refs/heads/testrepo-worktree",
       "refs/tags/e90810b",
       "refs/tags/foo/bar",
       "refs/tags/foo/foo/bar",