Commit 2f03050f4fc50746faef46be498aa0af9697fee2
2013-10-26T16:21:31
remote: download HEAD when no refspecs are given The correct behaviour when a remote has no refspecs (e.g. a URL from the command-line) is to download the remote's HEAD. Let's do that. This fixes #1261.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50
diff --git a/include/git2/remote.h b/include/git2/remote.h
index b9cf86e..15a92f3 100644
--- a/include/git2/remote.h
+++ b/include/git2/remote.h
@@ -54,7 +54,7 @@ GIT_EXTERN(int) git_remote_create(
*
* @param out pointer to the new remote object
* @param repo the associated repository
- * @param fetch the fetch refspec to use for this remote. May be NULL for defaults.
+ * @param fetch the fetch refspec to use for this remote.
* @param url the remote repository's URL
* @return 0 or an error code
*/
diff --git a/src/fetch.c b/src/fetch.c
index 5d97913..e83dc4a 100644
--- a/src/fetch.c
+++ b/src/fetch.c
@@ -23,7 +23,7 @@ struct filter_payload {
git_remote *remote;
const git_refspec *spec, *tagspec;
git_odb *odb;
- int found_head;
+ int want_head;
};
static int filter_ref__cb(git_remote_head *head, void *payload)
@@ -34,9 +34,9 @@ static int filter_ref__cb(git_remote_head *head, void *payload)
if (!git_reference_is_valid_name(head->name))
return 0;
- if (!p->found_head && strcmp(head->name, GIT_HEAD_FILE) == 0)
- p->found_head = 1;
- else if (p->remote->download_tags == GIT_REMOTE_DOWNLOAD_TAGS_ALL) {
+ if ((strcmp(head->name, GIT_HEAD_FILE) == 0) && p->want_head) {
+ match = 1;
+ } else if (p->remote->download_tags == GIT_REMOTE_DOWNLOAD_TAGS_ALL) {
/*
* If tagopt is --tags, then we only use the default
* tags refspec and ignore the remote's
@@ -77,8 +77,9 @@ static int filter_wants(git_remote *remote)
* HEAD, which will be stored in FETCH_HEAD after the fetch.
*/
p.tagspec = &tagspec;
- p.found_head = 0;
p.remote = remote;
+ if (remote->refspecs.length == 0)
+ p.want_head = 1;
if (git_repository_odb__weakptr(&p.odb, remote->repo) < 0)
goto cleanup;