Commit 1c7eb971acb386406c71f1f000d4fc789a361611
2012-07-10T12:04:23
Reindent.
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 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237
diff --git a/src/clone.c b/src/clone.c
index d8d3503..9e52728 100644
--- a/src/clone.c
+++ b/src/clone.c
@@ -154,8 +154,6 @@ static int update_head_to_remote(git_repository *repo, git_remote *remote)
/*
* submodules?
- * filemodes?
- * Line endings
*/
diff --git a/tests-clar/clone/clone.c b/tests-clar/clone/clone.c
index fe4eb8b..78202d7 100644
--- a/tests-clar/clone/clone.c
+++ b/tests-clar/clone/clone.c
@@ -7,110 +7,106 @@ static git_repository *g_repo;
void test_clone_clone__initialize(void)
{
- g_repo = NULL;
+ g_repo = NULL;
}
void test_clone_clone__cleanup(void)
{
- if (g_repo) {
- git_repository_free(g_repo);
- g_repo = NULL;
- }
+ if (g_repo) {
+ git_repository_free(g_repo);
+ g_repo = NULL;
+ }
}
// TODO: This is copy/pasted from network/remotelocal.c.
static void build_local_file_url(git_buf *out, const char *fixture)
{
- const char *in_buf;
+ const char *in_buf;
- git_buf path_buf = GIT_BUF_INIT;
+ git_buf path_buf = GIT_BUF_INIT;
- cl_git_pass(git_path_prettify_dir(&path_buf, fixture, NULL));
- cl_git_pass(git_buf_puts(out, "file://"));
+ cl_git_pass(git_path_prettify_dir(&path_buf, fixture, NULL));
+ cl_git_pass(git_buf_puts(out, "file://"));
#ifdef GIT_WIN32
- /*
- * A FILE uri matches the following format: file://[host]/path
- * where "host" can be empty and "path" is an absolute path to the resource.
- *
- * In this test, no hostname is used, but we have to ensure the leading triple slashes:
- *
- * *nix: file:///usr/home/...
- * Windows: file:///C:/Users/...
- */
- cl_git_pass(git_buf_putc(out, '/'));
+ /*
+ * A FILE uri matches the following format: file://[host]/path
+ * where "host" can be empty and "path" is an absolute path to the resource.
+ *
+ * In this test, no hostname is used, but we have to ensure the leading triple slashes:
+ *
+ * *nix: file:///usr/home/...
+ * Windows: file:///C:/Users/...
+ */
+ cl_git_pass(git_buf_putc(out, '/'));
#endif
- in_buf = git_buf_cstr(&path_buf);
+ in_buf = git_buf_cstr(&path_buf);
- /*
- * A very hacky Url encoding that only takes care of escaping the spaces
- */
- while (*in_buf) {
- if (*in_buf == ' ')
- cl_git_pass(git_buf_puts(out, "%20"));
- else
- cl_git_pass(git_buf_putc(out, *in_buf));
+ /*
+ * A very hacky Url encoding that only takes care of escaping the spaces
+ */
+ while (*in_buf) {
+ if (*in_buf == ' ')
+ cl_git_pass(git_buf_puts(out, "%20"));
+ else
+ cl_git_pass(git_buf_putc(out, *in_buf));
- in_buf++;
- }
+ in_buf++;
+ }
- git_buf_free(&path_buf);
+ git_buf_free(&path_buf);
}
void test_clone_clone__bad_url(void)
{
- /* Clone should clean up the mess if the URL isn't a git repository */
- cl_git_fail(git_clone(&g_repo, "not_a_repo", "./foo", NULL));
- cl_assert(!git_path_exists("./foo"));
- cl_git_fail(git_clone_bare(&g_repo, "not_a_repo", "./foo.git", NULL));
- cl_assert(!git_path_exists("./foo.git"));
+ /* Clone should clean up the mess if the URL isn't a git repository */
+ cl_git_fail(git_clone(&g_repo, "not_a_repo", "./foo", NULL));
+ cl_assert(!git_path_exists("./foo"));
+ cl_git_fail(git_clone_bare(&g_repo, "not_a_repo", "./foo.git", NULL));
+ cl_assert(!git_path_exists("./foo.git"));
}
void test_clone_clone__local(void)
{
- git_buf src = GIT_BUF_INIT;
- build_local_file_url(&src, cl_fixture("testrepo.git"));
+ git_buf src = GIT_BUF_INIT;
+ build_local_file_url(&src, cl_fixture("testrepo.git"));
#if 0
- cl_git_pass(git_clone(&g_repo, git_buf_cstr(&src), "./local", NULL));
- git_repository_free(g_repo);
- git_futils_rmdir_r("./local", GIT_DIRREMOVAL_FILES_AND_DIRS);
- cl_git_pass(git_clone_bare(&g_repo, git_buf_cstr(&src), "./local.git", NULL));
- git_futils_rmdir_r("./local.git", GIT_DIRREMOVAL_FILES_AND_DIRS);
+ cl_git_pass(git_clone(&g_repo, git_buf_cstr(&src), "./local", NULL));
+ git_repository_free(g_repo);
+ git_futils_rmdir_r("./local", GIT_DIRREMOVAL_FILES_AND_DIRS);
+ cl_git_pass(git_clone_bare(&g_repo, git_buf_cstr(&src), "./local.git", NULL));
+ git_futils_rmdir_r("./local.git", GIT_DIRREMOVAL_FILES_AND_DIRS);
#endif
- git_buf_free(&src);
+ git_buf_free(&src);
}
void test_clone_clone__network_full(void)
{
#if 0
- git_remote *origin;
-
- cl_git_pass(git_clone(&g_repo,
- "https://github.com/libgit2/GitForDelphi.git",
- "./libgit2", NULL));
- cl_assert(!git_repository_is_bare(g_repo));
- cl_git_pass(git_remote_load(&origin, g_repo, "origin"));
- git_futils_rmdir_r("./libgit2", GIT_DIRREMOVAL_FILES_AND_DIRS);
+ git_remote *origin;
+
+ cl_git_pass(git_clone(&g_repo, "http://github.com/libgit2/node-gitteh", "./attr", NULL));
+ cl_assert(!git_repository_is_bare(g_repo));
+ cl_git_pass(git_remote_load(&origin, g_repo, "origin"));
+ git_futils_rmdir_r("./attr", GIT_DIRREMOVAL_FILES_AND_DIRS);
#endif
}
void test_clone_clone__network_bare(void)
{
#if 0
- git_remote *origin;
-
- cl_git_pass(git_clone_bare(&g_repo,
- "https://github.com/libgit2/GitForDelphi.git",
- "./libgit2.git", NULL));
- cl_assert(git_repository_is_bare(g_repo));
- cl_git_pass(git_remote_load(&origin, g_repo, "origin"));
- git_futils_rmdir_r("./libgit2.git", GIT_DIRREMOVAL_FILES_AND_DIRS);
+ git_remote *origin;
+
+ cl_git_pass(git_clone_bare(&g_repo, "http://github.com/libgit2/node-gitteh", "attr", NULL));
+ cl_assert(git_repository_is_bare(g_repo));
+ cl_git_pass(git_remote_load(&origin, g_repo, "origin"));
+ git_futils_rmdir_r("./attr", GIT_DIRREMOVAL_FILES_AND_DIRS);
#endif
}
@@ -118,29 +114,29 @@ void test_clone_clone__network_bare(void)
void test_clone_clone__already_exists(void)
{
#if 0
- int bar;
-
- /* Should pass with existing-but-empty dir */
- p_mkdir("./foo", GIT_DIR_MODE);
- cl_git_pass(git_clone(&g_repo,
- "http://github.com/libgit2/libgit2.git",
- "./foo", NULL));
- git_repository_free(g_repo); g_repo = NULL;
- git_futils_rmdir_r("./foo", GIT_DIRREMOVAL_FILES_AND_DIRS);
+ int bar;
+
+ /* Should pass with existing-but-empty dir */
+ p_mkdir("./foo", GIT_DIR_MODE);
+ cl_git_pass(git_clone(&g_repo,
+ "http://github.com/libgit2/libgit2.git",
+ "./foo", NULL));
+ git_repository_free(g_repo); g_repo = NULL;
+ git_futils_rmdir_r("./foo", GIT_DIRREMOVAL_FILES_AND_DIRS);
#endif
- /* Should fail with a file */
- cl_git_mkfile("./foo", "Bar!");
- cl_git_fail(git_clone(&g_repo,
- "http://github.com/libgit2/libgit2.git",
- "./foo", NULL));
- git_futils_rmdir_r("./foo", GIT_DIRREMOVAL_FILES_AND_DIRS);
-
- /* Should fail with existing-and-nonempty dir */
- p_mkdir("./foo", GIT_DIR_MODE);
- cl_git_mkfile("./foo/bar", "Baz!");
- cl_git_fail(git_clone(&g_repo,
- "https://github.com/libgit2/libgit2.git",
- "./foo", NULL));
- git_futils_rmdir_r("./foo", GIT_DIRREMOVAL_FILES_AND_DIRS);
+ /* Should fail with a file */
+ cl_git_mkfile("./foo", "Bar!");
+ cl_git_fail(git_clone(&g_repo,
+ "http://github.com/libgit2/libgit2.git",
+ "./foo", NULL));
+ git_futils_rmdir_r("./foo", GIT_DIRREMOVAL_FILES_AND_DIRS);
+
+ /* Should fail with existing-and-nonempty dir */
+ p_mkdir("./foo", GIT_DIR_MODE);
+ cl_git_mkfile("./foo/bar", "Baz!");
+ cl_git_fail(git_clone(&g_repo,
+ "https://github.com/libgit2/libgit2.git",
+ "./foo", NULL));
+ git_futils_rmdir_r("./foo", GIT_DIRREMOVAL_FILES_AND_DIRS);
}