index.c 14.2 KB
Newer Older
1
#include "clar_libgit2.h"
2
#include "checkout_helpers.h"
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

#include "git2/checkout.h"
#include "repository.h"

static git_repository *g_repo;

void test_checkout_index__initialize(void)
{
	git_tree *tree;

	g_repo = cl_git_sandbox_init("testrepo");

	cl_git_pass(git_repository_head_tree(&tree, g_repo));

	reset_index_to_treeish((git_object *)tree);
	git_tree_free(tree);

	cl_git_rewritefile(
		"./testrepo/.gitattributes",
		"* text eol=lf\n");
}

void test_checkout_index__cleanup(void)
{
	cl_git_sandbox_cleanup();
}

void test_checkout_index__cannot_checkout_a_bare_repository(void)
{
	test_checkout_index__cleanup();

	g_repo = cl_git_sandbox_init("testrepo.git");

36
	cl_git_fail(git_checkout_index(g_repo, NULL, NULL));
37 38
}

39
void test_checkout_index__can_create_missing_files(void)
40
{
41 42
	git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT;

43 44 45 46
	cl_assert_equal_i(false, git_path_isfile("./testrepo/README"));
	cl_assert_equal_i(false, git_path_isfile("./testrepo/branch_file.txt"));
	cl_assert_equal_i(false, git_path_isfile("./testrepo/new.txt"));

47
	opts.checkout_strategy = GIT_CHECKOUT_SAFE_CREATE;
48

49
	cl_git_pass(git_checkout_index(g_repo, NULL, &opts));
50

51 52 53
	check_file_contents("./testrepo/README", "hey there\n");
	check_file_contents("./testrepo/branch_file.txt", "hi\nbye!\n");
	check_file_contents("./testrepo/new.txt", "my new file\n");
54 55
}

56 57
void test_checkout_index__can_remove_untracked_files(void)
{
58 59
	git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT;

60 61 62 63 64 65
	git_futils_mkdir("./testrepo/dir/subdir/subsubdir", NULL, 0755, GIT_MKDIR_PATH);
	cl_git_mkfile("./testrepo/dir/one", "one\n");
	cl_git_mkfile("./testrepo/dir/subdir/two", "two\n");

	cl_assert_equal_i(true, git_path_isdir("./testrepo/dir/subdir/subsubdir"));

66
	opts.checkout_strategy =
67 68
		GIT_CHECKOUT_SAFE_CREATE | GIT_CHECKOUT_REMOVE_UNTRACKED;

69
	cl_git_pass(git_checkout_index(g_repo, NULL, &opts));
70 71 72 73

	cl_assert_equal_i(false, git_path_isdir("./testrepo/dir"));
}

74 75
void test_checkout_index__honor_the_specified_pathspecs(void)
{
76
	git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT;
77 78
	char *entries[] = { "*.txt" };

79 80
	opts.paths.strings = entries;
	opts.paths.count = 1;
81 82 83 84 85

	cl_assert_equal_i(false, git_path_isfile("./testrepo/README"));
	cl_assert_equal_i(false, git_path_isfile("./testrepo/branch_file.txt"));
	cl_assert_equal_i(false, git_path_isfile("./testrepo/new.txt"));

86
	opts.checkout_strategy = GIT_CHECKOUT_SAFE_CREATE;
87

88
	cl_git_pass(git_checkout_index(g_repo, NULL, &opts));
89 90

	cl_assert_equal_i(false, git_path_isfile("./testrepo/README"));
91 92
	check_file_contents("./testrepo/branch_file.txt", "hi\nbye!\n");
	check_file_contents("./testrepo/new.txt", "my new file\n");
93 94 95 96
}

void test_checkout_index__honor_the_gitattributes_directives(void)
{
97
	git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT;
98 99 100 101 102
	const char *attributes =
		"branch_file.txt text eol=crlf\n"
		"new.txt text eol=lf\n";

	cl_git_mkfile("./testrepo/.gitattributes", attributes);
103
	cl_repo_set_bool(g_repo, "core.autocrlf", false);
104

105
	opts.checkout_strategy = GIT_CHECKOUT_SAFE_CREATE;
106

107
	cl_git_pass(git_checkout_index(g_repo, NULL, &opts));
108

109 110 111
	check_file_contents("./testrepo/README", "hey there\n");
	check_file_contents("./testrepo/new.txt", "my new file\n");
	check_file_contents("./testrepo/branch_file.txt", "hi\r\nbye!\r\n");
112 113 114 115 116
}

void test_checkout_index__honor_coreautocrlf_setting_set_to_true(void)
{
#ifdef GIT_WIN32
117
	git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT;
118 119 120
	const char *expected_readme_text = "hey there\r\n";

	cl_git_pass(p_unlink("./testrepo/.gitattributes"));
121
	cl_repo_set_bool(g_repo, "core.autocrlf", true);
122

123
	opts.checkout_strategy = GIT_CHECKOUT_SAFE_CREATE;
124

125
	cl_git_pass(git_checkout_index(g_repo, NULL, &opts));
126

127
	check_file_contents("./testrepo/README", expected_readme_text);
128 129 130 131 132
#endif
}

void test_checkout_index__honor_coresymlinks_setting_set_to_true(void)
{
133 134
	git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT;

135
	cl_repo_set_bool(g_repo, "core.symlinks", true);
136

137
	opts.checkout_strategy = GIT_CHECKOUT_SAFE_CREATE;
138

139
	cl_git_pass(git_checkout_index(g_repo, NULL, &opts));
140 141

#ifdef GIT_WIN32
142
	check_file_contents("./testrepo/link_to_new.txt", "new.txt");
143 144 145 146 147 148 149 150 151
#else
	{
		char link_data[1024];
		size_t link_size = 1024;

		link_size = p_readlink("./testrepo/link_to_new.txt", link_data, link_size);
		link_data[link_size] = '\0';
		cl_assert_equal_i(link_size, strlen("new.txt"));
		cl_assert_equal_s(link_data, "new.txt");
152
		check_file_contents("./testrepo/link_to_new.txt", "my new file\n");
153 154 155 156 157 158
	}
#endif
}

void test_checkout_index__honor_coresymlinks_setting_set_to_false(void)
{
159 160
	git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT;

161
	cl_repo_set_bool(g_repo, "core.symlinks", false);
162

163
	opts.checkout_strategy = GIT_CHECKOUT_SAFE_CREATE;
164

165
	cl_git_pass(git_checkout_index(g_repo, NULL, &opts));
166

167
	check_file_contents("./testrepo/link_to_new.txt", "new.txt");
168 169
}

170
void test_checkout_index__donot_overwrite_modified_file_by_default(void)
171
{
172 173
	git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT;

174 175
	cl_git_mkfile("./testrepo/new.txt", "This isn't what's stored!");

176 177 178
	/* set this up to not return an error code on conflicts, but it
	 * still will not have permission to overwrite anything...
	 */
179
	opts.checkout_strategy = GIT_CHECKOUT_SAFE | GIT_CHECKOUT_ALLOW_CONFLICTS;
180

181
	cl_git_pass(git_checkout_index(g_repo, NULL, &opts));
182

183
	check_file_contents("./testrepo/new.txt", "This isn't what's stored!");
184 185
}

186
void test_checkout_index__can_overwrite_modified_file(void)
187
{
188 189
	git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT;

190 191
	cl_git_mkfile("./testrepo/new.txt", "This isn't what's stored!");

192
	opts.checkout_strategy = GIT_CHECKOUT_FORCE;
193

194
	cl_git_pass(git_checkout_index(g_repo, NULL, &opts));
195

196
	check_file_contents("./testrepo/new.txt", "my new file\n");
197 198 199 200
}

void test_checkout_index__options_disable_filters(void)
{
201 202
	git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT;

203 204
	cl_git_mkfile("./testrepo/.gitattributes", "*.txt text eol=crlf\n");

205 206
	opts.checkout_strategy = GIT_CHECKOUT_SAFE_CREATE;
	opts.disable_filters = false;
207

208
	cl_git_pass(git_checkout_index(g_repo, NULL, &opts));
209

210
	check_file_contents("./testrepo/new.txt", "my new file\r\n");
211 212 213

	p_unlink("./testrepo/new.txt");

214 215
	opts.disable_filters = true;
	cl_git_pass(git_checkout_index(g_repo, NULL, &opts));
216

217
	check_file_contents("./testrepo/new.txt", "my new file\n");
218 219 220 221 222
}

void test_checkout_index__options_dir_modes(void)
{
#ifndef GIT_WIN32
223
	git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT;
224 225 226 227
	struct stat st;
	git_oid oid;
	git_commit *commit;

228
	cl_git_pass(git_reference_name_to_id(&oid, g_repo, "refs/heads/dir"));
229 230 231 232
	cl_git_pass(git_commit_lookup(&commit, g_repo, &oid));

	reset_index_to_treeish((git_object *)commit);

233 234
	opts.checkout_strategy = GIT_CHECKOUT_SAFE_CREATE;
	opts.dir_mode = 0701;
235

236
	cl_git_pass(git_checkout_index(g_repo, NULL, &opts));
237 238 239 240 241 242 243 244 245 246 247 248 249 250 251

	cl_git_pass(p_stat("./testrepo/a", &st));
	cl_assert_equal_i(st.st_mode & 0777, 0701);

	/* File-mode test, since we're on the 'dir' branch */
	cl_git_pass(p_stat("./testrepo/a/b.txt", &st));
	cl_assert_equal_i(st.st_mode & 0777, 0755);

	git_commit_free(commit);
#endif
}

void test_checkout_index__options_override_file_modes(void)
{
#ifndef GIT_WIN32
252
	git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT;
253 254
	struct stat st;

255 256
	opts.checkout_strategy = GIT_CHECKOUT_SAFE_CREATE;
	opts.file_mode = 0700;
257

258
	cl_git_pass(git_checkout_index(g_repo, NULL, &opts));
259 260 261 262 263 264 265 266

	cl_git_pass(p_stat("./testrepo/new.txt", &st));
	cl_assert_equal_i(st.st_mode & 0777, 0700);
#endif
}

void test_checkout_index__options_open_flags(void)
{
267 268
	git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT;

269 270
	cl_git_mkfile("./testrepo/new.txt", "hi\n");

271 272
	opts.checkout_strategy = GIT_CHECKOUT_SAFE_CREATE;
	opts.file_open_flags = O_CREAT | O_RDWR | O_APPEND;
273

274 275
	opts.checkout_strategy = GIT_CHECKOUT_FORCE;
	cl_git_pass(git_checkout_index(g_repo, NULL, &opts));
276

277
	check_file_contents("./testrepo/new.txt", "hi\nmy new file\n");
278
}
279

280
struct notify_data {
281 282 283 284
	const char *file;
	const char *sha;
};

285 286 287 288 289 290
static int test_checkout_notify_cb(
	git_checkout_notify_t why,
	const char *path,
	const git_diff_file *baseline,
	const git_diff_file *target,
	const git_diff_file *workdir,
291 292
	void *payload)
{
293
	struct notify_data *expectations = (struct notify_data *)payload;
294

295
	GIT_UNUSED(workdir);
296

297 298 299 300
	cl_assert_equal_i(GIT_CHECKOUT_NOTIFY_CONFLICT, why);
	cl_assert_equal_s(expectations->file, path);
	cl_assert_equal_i(0, git_oid_streq(&baseline->oid, expectations->sha));
	cl_assert_equal_i(0, git_oid_streq(&target->oid, expectations->sha));
301 302 303 304 305 306

	return 0;
}

void test_checkout_index__can_notify_of_skipped_files(void)
{
307
	git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT;
308
	struct notify_data data;
309 310 311 312 313 314 315 316 317 318 319 320

	cl_git_mkfile("./testrepo/new.txt", "This isn't what's stored!");

	/*
	 * $ git ls-tree HEAD
	 * 100644 blob a8233120f6ad708f843d861ce2b7228ec4e3dec6    README
	 * 100644 blob 3697d64be941a53d4ae8f6a271e4e3fa56b022cc    branch_file.txt
	 * 100644 blob a71586c1dfe8a71c6cbf6c129f404c5642ff31bd    new.txt
	 */
	data.file = "new.txt";
	data.sha = "a71586c1dfe8a71c6cbf6c129f404c5642ff31bd";

321
	opts.checkout_strategy =
322
		GIT_CHECKOUT_SAFE_CREATE | GIT_CHECKOUT_ALLOW_CONFLICTS;
323 324 325
	opts.notify_flags = GIT_CHECKOUT_NOTIFY_CONFLICT;
	opts.notify_cb = test_checkout_notify_cb;
	opts.notify_payload = &data;
326

327
	cl_git_pass(git_checkout_index(g_repo, NULL, &opts));
328 329
}

330
static int dont_notify_cb(
331 332 333 334 335
	git_checkout_notify_t why,
	const char *path,
	const git_diff_file *baseline,
	const git_diff_file *target,
	const git_diff_file *workdir,
336 337
	void *payload)
{
338 339 340 341 342
	GIT_UNUSED(why);
	GIT_UNUSED(path);
	GIT_UNUSED(baseline);
	GIT_UNUSED(target);
	GIT_UNUSED(workdir);
343 344 345 346 347 348 349 350 351
	GIT_UNUSED(payload);

	cl_assert(false);

	return 0;
}

void test_checkout_index__wont_notify_of_expected_line_ending_changes(void)
{
352 353
	git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT;

354
	cl_git_pass(p_unlink("./testrepo/.gitattributes"));
355
	cl_repo_set_bool(g_repo, "core.autocrlf", true);
356

357 358
	cl_git_mkfile("./testrepo/new.txt", "my new file\r\n");

359
	opts.checkout_strategy =
360
		GIT_CHECKOUT_SAFE_CREATE | GIT_CHECKOUT_ALLOW_CONFLICTS;
361 362 363
	opts.notify_flags = GIT_CHECKOUT_NOTIFY_CONFLICT;
	opts.notify_cb = dont_notify_cb;
	opts.notify_payload = NULL;
364

365
	cl_git_pass(git_checkout_index(g_repo, NULL, &opts));
366 367
}

368 369
static void checkout_progress_counter(
	const char *path, size_t cur, size_t tot, void *payload)
370
{
Ben Straub committed
371
	GIT_UNUSED(path); GIT_UNUSED(cur); GIT_UNUSED(tot);
372
	(*(int *)payload)++;
373 374 375 376
}

void test_checkout_index__calls_progress_callback(void)
{
377
	git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT;
378 379
	int calls = 0;

380 381 382
	opts.checkout_strategy = GIT_CHECKOUT_SAFE_CREATE;
	opts.progress_cb = checkout_progress_counter;
	opts.progress_payload = &calls;
383

384
	cl_git_pass(git_checkout_index(g_repo, NULL, &opts));
385
	cl_assert(calls > 0);
386
}
387 388 389

void test_checkout_index__can_overcome_name_clashes(void)
{
390
	git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT;
391 392 393 394 395 396 397 398 399
	git_index *index;

	cl_git_pass(git_repository_index(&index, g_repo));
	git_index_clear(index);

	cl_git_mkfile("./testrepo/path0", "content\r\n");
	cl_git_pass(p_mkdir("./testrepo/path1", 0777));
	cl_git_mkfile("./testrepo/path1/file1", "content\r\n");

400 401
	cl_git_pass(git_index_add_bypath(index, "path0"));
	cl_git_pass(git_index_add_bypath(index, "path1/file1"));
402

403 404 405 406 407 408 409 410
	cl_git_pass(p_unlink("./testrepo/path0"));
	cl_git_pass(git_futils_rmdir_r(
		"./testrepo/path1", NULL, GIT_RMDIR_REMOVE_FILES));

	cl_git_mkfile("./testrepo/path1", "content\r\n");
	cl_git_pass(p_mkdir("./testrepo/path0", 0777));
	cl_git_mkfile("./testrepo/path0/file0", "content\r\n");

411 412 413
	cl_assert(git_path_isfile("./testrepo/path1"));
	cl_assert(git_path_isfile("./testrepo/path0/file0"));

414
	opts.checkout_strategy =
415
		GIT_CHECKOUT_SAFE_CREATE | GIT_CHECKOUT_ALLOW_CONFLICTS;
416
	cl_git_pass(git_checkout_index(g_repo, index, &opts));
417 418 419 420

	cl_assert(git_path_isfile("./testrepo/path1"));
	cl_assert(git_path_isfile("./testrepo/path0/file0"));

421 422
	opts.checkout_strategy = GIT_CHECKOUT_FORCE;
	cl_git_pass(git_checkout_index(g_repo, index, &opts));
423 424 425 426

	cl_assert(git_path_isfile("./testrepo/path0"));
	cl_assert(git_path_isfile("./testrepo/path1/file1"));

427 428
	git_index_free(index);
}
429 430 431

void test_checkout_index__validates_struct_version(void)
{
432
	git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT;
433 434
	const git_error *err;

435 436
	opts.version = 1024;
	cl_git_fail(git_checkout_index(g_repo, NULL, &opts));
437 438 439 440

	err = giterr_last();
	cl_assert_equal_i(err->klass, GITERR_INVALID);

441
	opts.version = 0;
442
	giterr_clear();
443
	cl_git_fail(git_checkout_index(g_repo, NULL, &opts));
444 445 446 447

	err = giterr_last();
	cl_assert_equal_i(err->klass, GITERR_INVALID);
}
448 449 450 451 452

void test_checkout_index__can_update_prefixed_files(void)
{
	git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT;

453 454 455 456
	cl_assert_equal_i(false, git_path_isfile("./testrepo/README"));
	cl_assert_equal_i(false, git_path_isfile("./testrepo/branch_file.txt"));
	cl_assert_equal_i(false, git_path_isfile("./testrepo/new.txt"));

457 458 459 460 461 462 463
	cl_git_mkfile("./testrepo/READ", "content\n");
	cl_git_mkfile("./testrepo/README.after", "content\n");
	cl_git_pass(p_mkdir("./testrepo/branch_file", 0777));
	cl_git_pass(p_mkdir("./testrepo/branch_file/contained_dir", 0777));
	cl_git_mkfile("./testrepo/branch_file/contained_file", "content\n");
	cl_git_pass(p_mkdir("./testrepo/branch_file.txt.after", 0777));

464 465
	opts.checkout_strategy =
		GIT_CHECKOUT_SAFE_CREATE | GIT_CHECKOUT_REMOVE_UNTRACKED;
466 467 468

	cl_git_pass(git_checkout_index(g_repo, NULL, &opts));

469 470 471
	/* remove untracked will remove the .gitattributes file before the blobs
	 * were created, so they will have had crlf filtering applied on Windows
	 */
472 473 474
	check_file_contents_nocr("./testrepo/README", "hey there\n");
	check_file_contents_nocr("./testrepo/branch_file.txt", "hi\nbye!\n");
	check_file_contents_nocr("./testrepo/new.txt", "my new file\n");
475 476 477 478 479 480

	cl_assert(!git_path_exists("testrepo/READ"));
	cl_assert(!git_path_exists("testrepo/README.after"));
	cl_assert(!git_path_exists("testrepo/branch_file"));
	cl_assert(!git_path_exists("testrepo/branch_file.txt.after"));
}
481 482 483 484 485 486 487 488 489 490

void test_checkout_index__can_checkout_a_newly_initialized_repository(void)
{
	test_checkout_index__cleanup();

	g_repo = cl_git_sandbox_init("empty_standard_repo");
	cl_git_remove_placeholders(git_repository_path(g_repo), "dummy-marker.txt");

	cl_git_pass(git_checkout_index(g_repo, NULL, NULL));
}
491 492 493 494 495 496 497 498 499

void test_checkout_index__issue_1397(void)
{
	git_checkout_opts opts = GIT_CHECKOUT_OPTS_INIT;

	test_checkout_index__cleanup();

	g_repo = cl_git_sandbox_init("issue_1397");

Russell Belfer committed
500
	cl_repo_set_bool(g_repo, "core.autocrlf", true);
501 502 503 504 505

	opts.checkout_strategy = GIT_CHECKOUT_FORCE;

	cl_git_pass(git_checkout_index(g_repo, NULL, &opts));

506
	check_file_contents("./issue_1397/crlf_file.txt", "first line\r\nsecond line\r\nboth with crlf");
507
}