Lines Matching refs:ancestor
40 git_merge_file_input ancestor = GIT_MERGE_FILE_INPUT_INIT, in test_merge_files__automerge_from_bufs() local
46 ancestor.ptr = "0\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n"; in test_merge_files__automerge_from_bufs()
47 ancestor.size = strlen(ancestor.ptr); in test_merge_files__automerge_from_bufs()
48 ancestor.path = "testfile.txt"; in test_merge_files__automerge_from_bufs()
49 ancestor.mode = 0100755; in test_merge_files__automerge_from_bufs()
61 cl_git_pass(git_merge_file(&result, &ancestor, &ours, &theirs, 0)); in test_merge_files__automerge_from_bufs()
76 git_merge_file_input ancestor = GIT_MERGE_FILE_INPUT_INIT, in test_merge_files__automerge_use_best_path_and_mode() local
82 ancestor.ptr = "0\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n"; in test_merge_files__automerge_use_best_path_and_mode()
83 ancestor.size = strlen(ancestor.ptr); in test_merge_files__automerge_use_best_path_and_mode()
84 ancestor.path = "testfile.txt"; in test_merge_files__automerge_use_best_path_and_mode()
85 ancestor.mode = 0100755; in test_merge_files__automerge_use_best_path_and_mode()
97 cl_git_pass(git_merge_file(&result, &ancestor, &ours, &theirs, 0)); in test_merge_files__automerge_use_best_path_and_mode()
112 git_merge_file_input ancestor = GIT_MERGE_FILE_INPUT_INIT, in test_merge_files__conflict_from_bufs() local
120 ancestor.ptr = "Hello!\nAncestor!\n"; in test_merge_files__conflict_from_bufs()
121 ancestor.size = strlen(ancestor.ptr); in test_merge_files__conflict_from_bufs()
122 ancestor.path = "testfile.txt"; in test_merge_files__conflict_from_bufs()
123 ancestor.mode = 0100755; in test_merge_files__conflict_from_bufs()
135 cl_git_pass(git_merge_file(&result, &ancestor, &ours, &theirs, NULL)); in test_merge_files__conflict_from_bufs()
151 git_index_entry ancestor, ours, theirs; in test_merge_files__automerge_from_index() local
153 git_oid_fromstr(&ancestor.id, "6212c31dab5e482247d7977e4f0dd3601decf13b"); in test_merge_files__automerge_from_index()
154 ancestor.path = "automergeable.txt"; in test_merge_files__automerge_from_index()
155 ancestor.mode = 0100644; in test_merge_files__automerge_from_index()
166 &ancestor, &ours, &theirs, 0)); in test_merge_files__automerge_from_index()
181 git_merge_file_input ancestor = GIT_MERGE_FILE_INPUT_INIT, in test_merge_files__automerge_whitespace_eol() local
188 ancestor.ptr = "0 \n1\n2\n3\n4\n5\n6\n7\n8\n9\n10 \n"; in test_merge_files__automerge_whitespace_eol()
189 ancestor.size = strlen(ancestor.ptr); in test_merge_files__automerge_whitespace_eol()
190 ancestor.path = "testfile.txt"; in test_merge_files__automerge_whitespace_eol()
191 ancestor.mode = 0100755; in test_merge_files__automerge_whitespace_eol()
204 cl_git_pass(git_merge_file(&result, &ancestor, &ours, &theirs, &opts)); in test_merge_files__automerge_whitespace_eol()
219 git_merge_file_input ancestor = GIT_MERGE_FILE_INPUT_INIT, in test_merge_files__automerge_whitespace_change() local
226 ancestor.ptr = "0\n1\n2\n3\n4\n5 XXX\n6YYY\n7\n8\n9\n10\n"; in test_merge_files__automerge_whitespace_change()
227 ancestor.size = strlen(ancestor.ptr); in test_merge_files__automerge_whitespace_change()
228 ancestor.path = "testfile.txt"; in test_merge_files__automerge_whitespace_change()
229 ancestor.mode = 0100755; in test_merge_files__automerge_whitespace_change()
242 cl_git_pass(git_merge_file(&result, &ancestor, &ours, &theirs, &opts)); in test_merge_files__automerge_whitespace_change()
257 git_merge_file_input ancestor = GIT_MERGE_FILE_INPUT_INIT, in test_merge_files__doesnt_add_newline() local
264 ancestor.ptr = "0\n1\n2\n3\n4\n5 XXX\n6YYY\n7\n8\n9\n10"; in test_merge_files__doesnt_add_newline()
265 ancestor.size = strlen(ancestor.ptr); in test_merge_files__doesnt_add_newline()
266 ancestor.path = "testfile.txt"; in test_merge_files__doesnt_add_newline()
267 ancestor.mode = 0100755; in test_merge_files__doesnt_add_newline()
280 cl_git_pass(git_merge_file(&result, &ancestor, &ours, &theirs, &opts)); in test_merge_files__doesnt_add_newline()
317 git_merge_file_input ancestor = GIT_MERGE_FILE_INPUT_INIT, in test_merge_files__skips_binaries() local
322 ancestor.ptr = "ance\0stor\0"; in test_merge_files__skips_binaries()
323 ancestor.size = 10; in test_merge_files__skips_binaries()
324 ancestor.path = "ancestor.txt"; in test_merge_files__skips_binaries()
325 ancestor.mode = 0100755; in test_merge_files__skips_binaries()
337 cl_git_pass(git_merge_file(&result, &ancestor, &ours, &theirs, NULL)); in test_merge_files__skips_binaries()
346 git_merge_file_input ancestor = GIT_MERGE_FILE_INPUT_INIT, in test_merge_files__handles_binaries_when_favored() local
352 ancestor.ptr = "ance\0stor\0"; in test_merge_files__handles_binaries_when_favored()
353 ancestor.size = 10; in test_merge_files__handles_binaries_when_favored()
354 ancestor.path = "ancestor.txt"; in test_merge_files__handles_binaries_when_favored()
355 ancestor.mode = 0100755; in test_merge_files__handles_binaries_when_favored()
368 cl_git_pass(git_merge_file(&result, &ancestor, &ours, &theirs, &opts)); in test_merge_files__handles_binaries_when_favored()
383 git_merge_file_input ancestor = GIT_MERGE_FILE_INPUT_INIT, in test_merge_files__crlf_conflict_markers_for_crlf_files() local
400 ancestor.ptr = "This file has\r\nCRLF line endings.\r\n"; in test_merge_files__crlf_conflict_markers_for_crlf_files()
401 ancestor.size = 35; in test_merge_files__crlf_conflict_markers_for_crlf_files()
402 ancestor.path = "file.txt"; in test_merge_files__crlf_conflict_markers_for_crlf_files()
403 ancestor.mode = 0100644; in test_merge_files__crlf_conflict_markers_for_crlf_files()
415 cl_git_pass(git_merge_file(&result, &ancestor, &ours, &theirs, &opts)); in test_merge_files__crlf_conflict_markers_for_crlf_files()
422 cl_git_pass(git_merge_file(&result, &ancestor, &ours, &theirs, &opts)); in test_merge_files__crlf_conflict_markers_for_crlf_files()