Merge branch 'es/rebase-i-no-abbrev' into maint

diff --git a/builtin/clone.c b/builtin/clone.c
index 430307b298b4f9ea03ff4caea283b133fde0077e..21ad9f945c019625ace5f5dba0d4e54a8b2bb70f 100644 (file)
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -946,6 +946,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;