From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 5 Oct 2011 19:36:21 +0000 (-0700)
Subject: Merge branch 'jc/receive-verify'
X-Git-Tag: v1.7.8-rc0~137
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6f62cd7ab1c47a7ea32ab05cf1292d82c47310e9;p=git.git

Merge branch 'jc/receive-verify'

* jc/receive-verify:
  receive-pack: check connectivity before concluding "git push"
  check_everything_connected(): libify
  check_everything_connected(): refactor to use an iterator
  fetch: verify we have everything we need before updating our ref

Conflicts:
	builtin/fetch.c
---

6f62cd7ab1c47a7ea32ab05cf1292d82c47310e9
diff --cc Makefile
index 68201dea7,23d765892..741aac424
--- a/Makefile
+++ b/Makefile
@@@ -593,9 -586,9 +594,10 @@@ LIB_OBJS += cache-tree.
  LIB_OBJS += color.o
  LIB_OBJS += combine-diff.o
  LIB_OBJS += commit.o
 +LIB_OBJS += compat/obstack.o
  LIB_OBJS += config.o
  LIB_OBJS += connect.o
+ LIB_OBJS += connected.o
  LIB_OBJS += convert.o
  LIB_OBJS += copy.o
  LIB_OBJS += csum-file.o