Merge branch 'db/fetch-pack'
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Oct 2007 04:59:50 +0000 (21:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Oct 2007 04:59:50 +0000 (21:59 -0700)
* db/fetch-pack: (60 commits)
Define compat version of mkdtemp for systems lacking it
Avoid scary errors about tagged trees/blobs during git-fetch
fetch: if not fetching from default remote, ignore default merge
Support 'push --dry-run' for http transport
Support 'push --dry-run' for rsync transport
Fix 'push --all branch...' error handling
Fix compilation when NO_CURL is defined
Added a test for fetching remote tags when there is not tags.
Fix a crash in ls-remote when refspec expands into nothing
Remove duplicate ref matches in fetch
Restore default verbosity for http fetches.
fetch/push: readd rsync support
Introduce remove_dir_recursively()
bundle transport: fix an alloc_ref() call
Allow abbreviations in the first refspec to be merged
Prevent send-pack from segfaulting when a branch doesn't match
Cleanup unnecessary break in remote.c
Cleanup style nit of 'x == NULL' in remote.c
Fix memory leaks when disconnecting transport instances
Ensure builtin-fetch honors {fetch,transfer}.unpackLimit
...

1  2 
Makefile
dir.c
git.c
receive-pack.c
remote.c
send-pack.c
diff --cc Makefile
Simple merge
diff --cc dir.c
Simple merge
diff --cc git.c
Simple merge
diff --cc receive-pack.c
Simple merge
diff --cc remote.c
Simple merge
diff --cc send-pack.c
Simple merge