diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:36:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-05 12:36:21 -0700 |
| commit | 6f62cd7ab1c47a7ea32ab05cf1292d82c47310e9 (patch) | |
| tree | a804881bfeb0e7b859d531b41bf95b1efaa891f5 /Makefile | |
| parent | Merge branch 'jc/fetch-verify' (diff) | |
| parent | receive-pack: check connectivity before concluding "git push" (diff) | |
| download | tgif-6f62cd7ab1c47a7ea32ab05cf1292d82c47310e9.tar.xz | |
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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -516,6 +516,7 @@ LIB_H += compat/win32/pthread.h LIB_H += compat/win32/syslog.h LIB_H += compat/win32/sys/poll.h LIB_H += compat/win32/dirent.h +LIB_H += connected.h LIB_H += csum-file.h LIB_H += decorate.h LIB_H += delta.h @@ -596,6 +597,7 @@ 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 |