diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-01-25 17:11:30 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-25 17:11:30 -0800 |
| commit | 45099df6d7d83b30300f8efa3f6b831d6132c687 (patch) | |
| tree | cb111be7f8b0c43958b3833008e1625099f575a5 | |
| parent | diff-options.txt: Fix asciidoc markup issue (diff) | |
| parent | Allow cloning an empty repository (diff) | |
| download | tgif-45099df6d7d83b30300f8efa3f6b831d6132c687.tar.xz | |
Merge branch 'sr/clone-empty'
* sr/clone-empty:
Allow cloning an empty repository
| -rw-r--r-- | builtin-clone.c | 17 | ||||
| -rwxr-xr-x | t/t5701-clone-local.sh | 16 |
2 files changed, 29 insertions, 4 deletions
diff --git a/builtin-clone.c b/builtin-clone.c index f7e5a7b0a0..1e9c9aa844 100644 --- a/builtin-clone.c +++ b/builtin-clone.c @@ -522,14 +522,23 @@ int cmd_clone(int argc, const char **argv, const char *prefix) option_upload_pack); refs = transport_get_remote_refs(transport); - transport_fetch_refs(transport, refs); + if(refs) + transport_fetch_refs(transport, refs); } - clear_extra_refs(); + if (refs) { + clear_extra_refs(); - mapped_refs = write_remote_refs(refs, &refspec, reflog_msg.buf); + mapped_refs = write_remote_refs(refs, &refspec, reflog_msg.buf); - head_points_at = locate_head(refs, mapped_refs, &remote_head); + head_points_at = locate_head(refs, mapped_refs, &remote_head); + } + else { + warning("You appear to have cloned an empty repository."); + head_points_at = NULL; + remote_head = NULL; + option_no_checkout = 1; + } if (head_points_at) { /* Local default branch link */ diff --git a/t/t5701-clone-local.sh b/t/t5701-clone-local.sh index 8dfaaa456e..fbd9bfa573 100755 --- a/t/t5701-clone-local.sh +++ b/t/t5701-clone-local.sh @@ -116,4 +116,20 @@ test_expect_success 'bundle clone with nonexistent HEAD' ' test ! -e .git/refs/heads/master ' +test_expect_success 'clone empty repository' ' + cd "$D" && + mkdir empty && + (cd empty && git init) && + git clone empty empty-clone && + test_tick && + (cd empty-clone + echo "content" >> foo && + git add foo && + git commit -m "Initial commit" && + git push origin master && + expected=$(git rev-parse master) && + actual=$(git --git-dir=../empty/.git rev-parse master) && + test $actual = $expected) +' + test_done |