undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clone --branch: refuse to clone if upstream repo is empty

Browse Source 
Since 920b691 (clone: refuse to clone if --branch
points to bogus ref) we refuse to clone with option
"-b" if the specified branch does not exist in the
(non-empty) upstream. If the upstream repository is empty,
the branch doesn't exist, either. So refuse the clone too.

Reported-by: Robert Mitwicki <robert.mitwicki@opensoftware.pl>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Acked-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
This commit is contained in:
Ralf Thielow 2013-10-11 18:49:02 +02:00 committed by Jonathan Nieder
parent 02a110ad43
commit a3552aba55
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/clone.c
View File

@ -946,6 +946,10 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
our_head_points_at = remote_head_points_at; our_head_points_at = remote_head_points_at;
} }
else { 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.")); warning(_("You appear to have cloned an empty repository."));
mapped_refs = NULL; mapped_refs = NULL;
our_head_points_at = NULL; our_head_points_at = NULL;

8
t/t5706-clone-branch.sh
View File

@ -20,7 +20,9 @@ test_expect_success 'setup' '
echo one >file && git add file && git commit -m one && echo one >file && git add file && git commit -m one &&
git checkout -b two && git checkout -b two &&
echo two >file && git add file && git commit -m 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' ' 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_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 test_done