From 22413d2d11faee66ba1fbdb25988b428cf84d5e5 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Fri, 12 Dec 2014 14:44:41 -0800
Subject: [PATCH] Update git2 and cargo snapshots

Should fix #1032 and #1029
---
 Cargo.lock        | 18 +++++++++---------
 src/snapshots.txt |  8 ++++++++
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 368da9e1b66..c450e3b84ef 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -32,7 +32,7 @@ source = "git+https://github.com/carllerche/curl-rust#8e8e28955c3289fa77f7d6eb39
 dependencies = [
  "libz-sys 0.1.0 (git+https://github.com/alexcrichton/libz-sys)",
  "openssl-sys 0.2.2 (git+https://github.com/sfackler/rust-openssl)",
- "pkg-config 0.1.0 (git+https://github.com/alexcrichton/pkg-config-rs)",
+ "pkg-config 0.1.1 (git+https://github.com/alexcrichton/pkg-config-rs)",
 ]
 
 [[package]]
@@ -61,7 +61,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "git2"
 version = "0.0.1"
-source = "git+https://github.com/alexcrichton/git2-rs#0a97e47340323c73e7bb9d294d462f8238ff265d"
+source = "git+https://github.com/alexcrichton/git2-rs#56d256353fc46c5d7de5c89f2242d0b0cb7d3510"
 dependencies = [
  "libgit2-sys 0.0.1 (git+https://github.com/alexcrichton/git2-rs)",
  "time 0.1.1 (git+https://github.com/rust-lang/time)",
@@ -81,11 +81,11 @@ source = "git+https://github.com/carllerche/hamcrest-rust.git#2b9bd6cdae5dcf08ac
 [[package]]
 name = "libgit2-sys"
 version = "0.0.1"
-source = "git+https://github.com/alexcrichton/git2-rs#0a97e47340323c73e7bb9d294d462f8238ff265d"
+source = "git+https://github.com/alexcrichton/git2-rs#56d256353fc46c5d7de5c89f2242d0b0cb7d3510"
 dependencies = [
  "libssh2-sys 0.0.1 (git+https://github.com/alexcrichton/ssh2-rs)",
  "openssl-sys 0.2.2 (git+https://github.com/sfackler/rust-openssl)",
- "pkg-config 0.1.0 (git+https://github.com/alexcrichton/pkg-config-rs)",
+ "pkg-config 0.1.1 (git+https://github.com/alexcrichton/pkg-config-rs)",
 ]
 
 [[package]]
@@ -95,7 +95,7 @@ source = "git+https://github.com/alexcrichton/ssh2-rs#982dc47a45a5a2d66ea092ee6b
 dependencies = [
  "libz-sys 0.1.0 (git+https://github.com/alexcrichton/libz-sys)",
  "openssl-sys 0.2.2 (git+https://github.com/sfackler/rust-openssl)",
- "pkg-config 0.1.0 (git+https://github.com/alexcrichton/pkg-config-rs)",
+ "pkg-config 0.1.1 (git+https://github.com/alexcrichton/pkg-config-rs)",
 ]
 
 [[package]]
@@ -103,7 +103,7 @@ name = "libz-sys"
 version = "0.1.0"
 source = "git+https://github.com/alexcrichton/libz-sys#6c19f1309966ce5959ec0472a4730f457136f687"
 dependencies = [
- "pkg-config 0.1.0 (git+https://github.com/alexcrichton/pkg-config-rs)",
+ "pkg-config 0.1.1 (git+https://github.com/alexcrichton/pkg-config-rs)",
 ]
 
 [[package]]
@@ -125,12 +125,12 @@ dependencies = [
 [[package]]
 name = "pkg-config"
 version = "0.1.0"
-source = "git+https://github.com/alexcrichton/pkg-config-rs#9b3b44a2e1a8ccc70c3f701aeb5154ad79e665e9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "pkg-config"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+version = "0.1.1"
+source = "git+https://github.com/alexcrichton/pkg-config-rs#9a57960fa5c3480e8daa318772f3b0d1c76b572c"
 
 [[package]]
 name = "registry"
diff --git a/src/snapshots.txt b/src/snapshots.txt
index c1b952d5204..b7e48af08e5 100644
--- a/src/snapshots.txt
+++ b/src/snapshots.txt
@@ -1,3 +1,11 @@
+2014-12-08
+  linux-i386 853d29bc167748f8a481d5d43fb20ab99e3e16ee
+  linux-x86_64 57c79c64459145321baa8fc45d51c588d18125ad
+  macos-i386 43b483c9a389243ce58ba5356c4f71a626dc5658
+  macos-x86_64 3777768da6a820f49d789c3477b493b24de59a61
+  winnt-i386 b831d1d673db189496f94d3596351d9545687947
+  winnt-x86_64 846b677e6fec99690b00595b934fdb30b834c815
+
 2014-11-22
   linux-i386 3204c8a38721199f69d2971db887d1dc71a63825
   linux-x86_64 39ca0d02eac184bc764ff9c1f645ca361715c5c2