Commit a5696702dbd8c7abbd37f083a411adecab7cedfe
2021-07-08T11:58:28
skip descendant check if remote ref not found
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 51 52 53 54 55 56 57
diff --git a/src/remote.c b/src/remote.c
index d17c389..ec68cc0 100644
--- a/src/remote.c
+++ b/src/remote.c
@@ -1460,7 +1460,9 @@ static int update_tips_for_spec(
if (error < 0 && error != GIT_ENOTFOUND)
goto on_error;
- if (!error && !spec->force && !git_graph_descendant_of(remote->repo, &head->oid, &old))
+ if (!(error || error == GIT_ENOTFOUND)
+ && !spec->force
+ && !git_graph_descendant_of(remote->repo, &head->oid, &old))
continue;
if (error == GIT_ENOTFOUND) {
diff --git a/tests/remote/fetch.c b/tests/remote/fetch.c
index 8a61a26..392801e 100644
--- a/tests/remote/fetch.c
+++ b/tests/remote/fetch.c
@@ -13,33 +13,18 @@ static const char *REPO2_REFNAME = "refs/remotes/repo1/main";
static char *FORCE_FETCHSPEC = "+refs/heads/main:refs/remotes/repo1/main";
static char *NON_FORCE_FETCHSPEC = "refs/heads/main:refs/remotes/repo1/main";
-char* strip_trailing_slash(char *path) {
- if (path[strlen(path) - 1] == '/') {
- char* result = (char *) calloc(strlen(path) - 1, sizeof(char));
- memcpy(result, path, strlen(path) - 1);
- return result;
- } else {
- char* result = (char *) calloc(strlen(path), sizeof(char));
- strncpy(result, path, strlen(path));
- return result;
- }
-}
-
-
void test_remote_fetch__initialize(void) {
git_config *c;
git_buf repo1_path_buf = GIT_BUF_INIT;
git_buf repo2_path_buf = GIT_BUF_INIT;
const char *sandbox = clar_sandbox_path();
- cl_git_pass(git_buf_join(&repo1_path_buf, '/', sandbox, "fetchtest_repo1"));
- repo1_path = calloc(repo1_path_buf.size, sizeof(char));
- git_buf_copy_cstr(repo1_path, repo1_path_buf.size, &repo1_path_buf);
+ cl_git_pass(git_buf_joinpath(&repo1_path_buf, sandbox, "fetchtest_repo1"));
+ repo1_path = git_buf_detach(&repo1_path_buf);
cl_git_pass(git_repository_init(&repo1, repo1_path, true));
- cl_git_pass(git_buf_join(&repo2_path_buf, '/', sandbox, "fetchtest_repo2"));
- repo2_path = calloc(repo2_path_buf.size, sizeof(char));
- git_buf_copy_cstr(repo2_path, repo2_path_buf.size, &repo2_path_buf);
+ cl_git_pass(git_buf_joinpath(&repo2_path_buf, sandbox, "fetchtest_repo2"));
+ repo2_path = git_buf_detach(&repo2_path_buf);
cl_git_pass(git_repository_init(&repo2, repo2_path, true));
cl_git_pass(git_repository_config(&c, repo1));