Commit c300d84a64601b09abcf0f2d2e6d492b4578770d
2014-07-03T07:54:26
remote: don't DWIM refspecs unnecessarily We can only DWIM when we've connected to the remote and have the list of the remote's references. Adding or setting the refspecs should not trigger an attempt to DWIM the refspecs as we typically cannot do it, and even if we did, we would not use them for the current fetch.
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
diff --git a/src/remote.c b/src/remote.c
index 8cf8c03..b3e968e 100644
--- a/src/remote.c
+++ b/src/remote.c
@@ -1669,27 +1669,14 @@ void git_remote_clear_refspecs(git_remote *remote)
git_vector_clear(&remote->refspecs);
}
-static int add_and_dwim(git_remote *remote, const char *str, int push)
-{
- git_refspec *spec;
- git_vector *vec;
-
- if (add_refspec(remote, str, !push) < 0)
- return -1;
-
- vec = &remote->refspecs;
- spec = git_vector_get(vec, vec->length - 1);
- return git_refspec__dwim_one(&remote->active_refspecs, spec, &remote->refs);
-}
-
int git_remote_add_fetch(git_remote *remote, const char *refspec)
{
- return add_and_dwim(remote, refspec, false);
+ return add_refspec(remote, refspec, true);
}
int git_remote_add_push(git_remote *remote, const char *refspec)
{
- return add_and_dwim(remote, refspec, true);
+ return add_refspec(remote, refspec, false);
}
static int set_refspecs(git_remote *remote, git_strarray *array, int push)
@@ -1717,10 +1704,7 @@ static int set_refspecs(git_remote *remote, git_strarray *array, int push)
return -1;
}
- free_refspecs(&remote->active_refspecs);
- git_vector_clear(&remote->active_refspecs);
-
- return dwim_refspecs(&remote->active_refspecs, &remote->refspecs, &remote->refs);
+ return 0;
}
int git_remote_set_fetch_refspecs(git_remote *remote, git_strarray *array)