diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-10-15 16:15:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-15 16:15:00 -0700 |
| commit | 9768648144e8597890d371d9581eb26da52a4922 (patch) | |
| tree | f21f08ddcb4021eb248e6873b0f0aa2b4d91bd10 | |
| parent | 6fb02165a3885314b5b356263dd267a5966f92be (diff) | |
| parent | 3991e91063bb701d8ba12199b993a8f121f27f04 (diff) | |
| download | git-9768648144e8597890d371d9581eb26da52a4922.tar.gz | |
Merge branch 'maint'
* maint:
git-prune-packed.txt: fix reference to GIT_OBJECT_DIRECTORY
clone --branch: refuse to clone if upstream repo is empty
| -rw-r--r-- | Documentation/git-prune-packed.txt | 2 | ||||
| -rw-r--r-- | builtin/clone.c | 4 | ||||
| -rwxr-xr-x | t/t5706-clone-branch.sh | 8 |
3 files changed, 12 insertions, 2 deletions
diff --git a/Documentation/git-prune-packed.txt b/Documentation/git-prune-packed.txt index 80dc022ede..6738055bd3 100644 --- a/Documentation/git-prune-packed.txt +++ b/Documentation/git-prune-packed.txt @@ -14,7 +14,7 @@ SYNOPSIS DESCRIPTION ----------- -This program searches the `$GIT_OBJECT_DIR` for all objects that currently +This program searches the `$GIT_OBJECT_DIRECTORY` for all objects that currently exist in a pack file as well as the independent object directories. All such extra objects are removed. diff --git a/builtin/clone.c b/builtin/clone.c index 0aff974a64..b708c115a3 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -945,6 +945,10 @@ int cmd_clone(int argc, const char **argv, const char *prefix) our_head_points_at = remote_head_points_at; } else { + if (option_branch) + die(_("Remote branch %s not found in upstream %s"), + option_branch, option_origin); + warning(_("You appear to have cloned an empty repository.")); mapped_refs = NULL; our_head_points_at = NULL; diff --git a/t/t5706-clone-branch.sh b/t/t5706-clone-branch.sh index 56be67e07e..6e7a7be052 100755 --- a/t/t5706-clone-branch.sh +++ b/t/t5706-clone-branch.sh @@ -20,7 +20,9 @@ test_expect_success 'setup' ' echo one >file && git add file && git commit -m one && git checkout -b two && echo two >file && git add file && git commit -m two && - git checkout master) + git checkout master) && + mkdir empty && + (cd empty && git init) ' test_expect_success 'vanilla clone chooses HEAD' ' @@ -61,4 +63,8 @@ test_expect_success 'clone -b with bogus branch' ' test_must_fail git clone -b bogus parent clone-bogus ' +test_expect_success 'clone -b not allowed with empty repos' ' + test_must_fail git clone -b branch empty clone-branch-empty +' + test_done |