Fix trailing whitespaces

examples/rev-list.c

@@ -117,4 +117,3 @@ int main (int argc, char **argv)
 
 	return 0;
 }
-

include/git2/sys/index.h

@@ -177,4 +177,3 @@ GIT_EXTERN(void) git_index_reuc_clear(git_index *index);
 /** @} */
 GIT_END_DECL
 #endif
-

include/git2/trace.h

@@ -65,4 +65,3 @@ GIT_EXTERN(int) git_trace_set(git_trace_level_t level, git_trace_callback cb);
 /** @} */
 GIT_END_DECL
 #endif
-

src/hashsig.c

@@ -365,4 +365,3 @@ int git_hashsig_compare(const git_hashsig *a, const git_hashsig *b)
 	return (hashsig_heap_compare(&a->mins, &b->mins) +
 			hashsig_heap_compare(&a->maxs, &b->maxs)) / 2;
 }
-

src/merge.c

@@ -1628,4 +1628,3 @@ void git_merge_diff_list__free(git_merge_diff_list *diff_list)
 	git_pool_clear(&diff_list->pool);
 	git__free(diff_list);
 }
-

src/merge_file.c

@@ -172,4 +172,3 @@ int git_merge_files(
 done:
 	return error;
 }
-

src/revparse.c

@@ -855,4 +855,3 @@ int git_revparse(
 
 	return error;
 }
-

src/trace.c

@@ -36,4 +36,3 @@ int git_trace_set(git_trace_level_t level, git_trace_callback callback)
 	return -1;
 #endif
 }
-

src/win32/findfile.c

@@ -235,4 +235,3 @@ int git_win32__find_xdg_dirs(git_buf *out)
 
 	return win32_find_existing_dirs(out, global_tmpls, temp);
 }
-

tests-clar/merge/merge_helpers.c

@@ -176,30 +176,30 @@ int merge_test_merge_conflicts(git_vector *conflicts, const struct merge_index_c
 			return 0;
 	}
 
-    return 1;
+	return 1;
 }
 
 int merge_test_index(git_index *index, const struct merge_index_entry expected[], size_t expected_len)
 {
-    size_t i;
+	size_t i;
-    const git_index_entry *index_entry;
+	const git_index_entry *index_entry;
 
 	/*
 	dump_index_entries(&index->entries);
 	*/
 
-    if (git_index_entrycount(index) != expected_len)
+	if (git_index_entrycount(index) != expected_len)
-        return 0;
+		return 0;
 
-    for (i = 0; i < expected_len; i++) {
+	for (i = 0; i < expected_len; i++) {
-        if ((index_entry = git_index_get_byindex(index, i)) == NULL)
+		if ((index_entry = git_index_get_byindex(index, i)) == NULL)
-            return 0;
+			return 0;
 
 		if (!index_entry_eq_merge_index_entry(&expected[i], index_entry))
 			return 0;
-    }
+	}
 
-    return 1;
+	return 1;
 }
 
 int merge_test_names(git_index *index, const struct merge_name_entry expected[], size_t expected_len)
@@ -227,20 +227,20 @@ int merge_test_names(git_index *index, const struct merge_name_entry expected[],
 
 int merge_test_reuc(git_index *index, const struct merge_reuc_entry expected[], size_t expected_len)
 {
-    size_t i;
+	size_t i;
 	const git_index_reuc_entry *reuc_entry;
-    git_oid expected_oid;
+	git_oid expected_oid;
 
 	/*
 	dump_reuc(index);
 	*/
 
-    if (git_index_reuc_entrycount(index) != expected_len)
+	if (git_index_reuc_entrycount(index) != expected_len)
-        return 0;
+		return 0;
 
-    for (i = 0; i < expected_len; i++) {
+	for (i = 0; i < expected_len; i++) {
-        if ((reuc_entry = git_index_reuc_get_byindex(index, i)) == NULL)
+		if ((reuc_entry = git_index_reuc_get_byindex(index, i)) == NULL)
-            return 0;
+			return 0;
 
 		if (strcmp(reuc_entry->path, expected[i].path) != 0 ||
 			reuc_entry->mode[0] != expected[i].ancestor_mode ||
@@ -268,9 +268,9 @@ int merge_test_reuc(git_index *index, const struct merge_reuc_entry expected[],
 			if (git_oid_cmp(&reuc_entry->oid[2], &expected_oid) != 0)
 				return 0;
 		}
-    }
+	}
 
-    return 1;
+	return 1;
 }
 
 int dircount(void *payload, git_buf *pathbuf)

tests-clar/merge/trees/automerge.c

@@ -105,7 +105,7 @@ void test_merge_trees_automerge__automerge(void)
 		{ 0100644, "2bd0a343aeef7a2cf0d158478966a6e587ff3863", 3, "conflicting.txt" },
 
 		UNCHANGED_INDEX_ENTRY,
-    };
+	};
 
 	struct merge_reuc_entry merge_reuc_entries[] = {
 		AUTOMERGEABLE_REUC_ENTRY,

tests-clar/merge/trees/modeconflict.c

@@ -49,7 +49,7 @@ void test_merge_trees_modeconflict__df_conflict(void)
 		{ 0100644, "e49f917b448d1340b31d76e54ba388268fd4c922", 0, "file-4/new" },
 		{ 0100644, "cab2cf23998b40f1af2d9d9a756dc9e285a8df4b", 2, "file-5/new" },
 		{ 0100644, "f5504f36e6f4eb797a56fc5bac6c6c7f32969bf2", 3, "file-5/new" },
-    };
+	};
 
 	cl_git_pass(merge_trees_from_branches(&index, repo, DF_SIDE1_BRANCH, DF_SIDE2_BRANCH, NULL));
 

tests-clar/merge/trees/renames.c

@@ -250,4 +250,3 @@ void test_merge_trees_renames__no_rename_index(void)
 
 	git_index_free(index);
 }
-

tests-clar/merge/trees/treediff.c

@@ -58,13 +58,13 @@ static void test_find_differences(
 	opts.metric->similarity = git_diff_find_similar__calc_similarity;
 	opts.metric->payload = (void *)GIT_HASHSIG_SMART_WHITESPACE;
 
-    cl_git_pass(git_oid_fromstr(&ancestor_oid, ancestor_oidstr));
+	cl_git_pass(git_oid_fromstr(&ancestor_oid, ancestor_oidstr));
-    cl_git_pass(git_oid_fromstr(&ours_oid, ours_oidstr));
+	cl_git_pass(git_oid_fromstr(&ours_oid, ours_oidstr));
-    cl_git_pass(git_oid_fromstr(&theirs_oid, theirs_oidstr));
+	cl_git_pass(git_oid_fromstr(&theirs_oid, theirs_oidstr));
 
-    cl_git_pass(git_tree_lookup(&ancestor_tree, repo, &ancestor_oid));
+	cl_git_pass(git_tree_lookup(&ancestor_tree, repo, &ancestor_oid));
-    cl_git_pass(git_tree_lookup(&ours_tree, repo, &ours_oid));
+	cl_git_pass(git_tree_lookup(&ours_tree, repo, &ours_oid));
-    cl_git_pass(git_tree_lookup(&theirs_tree, repo, &theirs_oid));
+	cl_git_pass(git_tree_lookup(&theirs_tree, repo, &theirs_oid));
 
 	cl_git_pass(git_merge_diff_list__find_differences(merge_diff_list, ancestor_tree, ours_tree, theirs_tree));
 	cl_git_pass(git_merge_diff_list__find_renames(repo, merge_diff_list, &opts));
@@ -73,13 +73,13 @@ static void test_find_differences(
 	dump_merge_index(merge_index);
 	 */
 
-    cl_assert(treediff_conflict_data_len == merge_diff_list->conflicts.length);
+	cl_assert(treediff_conflict_data_len == merge_diff_list->conflicts.length);
 
 	cl_assert(merge_test_merge_conflicts(&merge_diff_list->conflicts, treediff_conflict_data, treediff_conflict_data_len));
 
-    git_tree_free(ancestor_tree);
+	git_tree_free(ancestor_tree);
-    git_tree_free(ours_tree);
+	git_tree_free(ours_tree);
-    git_tree_free(theirs_tree);
+	git_tree_free(theirs_tree);
 
 	git_merge_diff_list__free(merge_diff_list);
 
@@ -88,7 +88,7 @@ static void test_find_differences(
 
 void test_merge_trees_treediff__simple(void)
 {
-    struct merge_index_conflict_data treediff_conflict_data[] = {
+	struct merge_index_conflict_data treediff_conflict_data[] = {
 		{
 			{ { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED },
 			{ { 0100644, "233c0919c998ed110a4b6ff36f353aec8b713487", 0, "added-in-master.txt" }, GIT_DELTA_ADDED },
@@ -96,7 +96,7 @@ void test_merge_trees_treediff__simple(void)
 			GIT_MERGE_DIFF_NONE
 		},
 
-        {
+		{
 			{ { 0100644, "6212c31dab5e482247d7977e4f0dd3601decf13b", 0, "automergeable.txt" }, GIT_DELTA_UNMODIFIED },
 			{ { 0100644, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf", 0, "automergeable.txt" }, GIT_DELTA_MODIFIED },
 			{ { 0100644, "058541fc37114bfc1dddf6bd6bffc7fae5c2e6fe", 0, "automergeable.txt" }, GIT_DELTA_MODIFIED },
@@ -144,7 +144,7 @@ void test_merge_trees_treediff__simple(void)
 
 void test_merge_trees_treediff__df_conflicts(void)
 {
-    struct merge_index_conflict_data treediff_conflict_data[] = {
+	struct merge_index_conflict_data treediff_conflict_data[] = {
 		{
 			{ { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED },
 			{ { 0100644, "49130a28ef567af9a6a6104c38773fedfa5f9742", 0, "dir-10" }, GIT_DELTA_ADDED },
@@ -349,7 +349,7 @@ void test_merge_trees_treediff__strict_renames(void)
 		},
     };
 
-    test_find_differences(TREE_OID_ANCESTOR, TREE_OID_MASTER, TREE_OID_RENAMES1, treediff_conflict_data, 8);
+	test_find_differences(TREE_OID_ANCESTOR, TREE_OID_MASTER, TREE_OID_RENAMES1, treediff_conflict_data, 8);
 }
 
 void test_merge_trees_treediff__rename_conflicts(void)
@@ -481,8 +481,7 @@ void test_merge_trees_treediff__rename_conflicts(void)
 			GIT_MERGE_DIFF_BOTH_RENAMED_2_TO_1,
 		},
     };
-    
+	test_find_differences(TREE_OID_RENAME_CONFLICT_ANCESTOR,
-    test_find_differences(TREE_OID_RENAME_CONFLICT_ANCESTOR,
 		TREE_OID_RENAME_CONFLICT_OURS, TREE_OID_RENAME_CONFLICT_THEIRS, treediff_conflict_data, 18);
 }
 
@@ -494,7 +493,7 @@ void test_merge_trees_treediff__best_renames(void)
 			{ { 0100644, "233c0919c998ed110a4b6ff36f353aec8b713487", 0, "added-in-master.txt" }, GIT_DELTA_ADDED },
 			{ { 0, "", 0, "" }, GIT_DELTA_UNMODIFIED },
 			GIT_MERGE_DIFF_NONE,
-        },
+		},
 
 		{
 			{ { 0100644, "6212c31dab5e482247d7977e4f0dd3601decf13b", 0, "automergeable.txt" }, GIT_DELTA_UNMODIFIED },
@@ -539,5 +538,5 @@ void test_merge_trees_treediff__best_renames(void)
 		},
     };
 
-    test_find_differences(TREE_OID_ANCESTOR, TREE_OID_MASTER, TREE_OID_RENAMES2, treediff_conflict_data, 7);
+	test_find_differences(TREE_OID_ANCESTOR, TREE_OID_MASTER, TREE_OID_RENAMES2, treediff_conflict_data, 7);
 }

tests-clar/refs/revparse.c

@@ -694,4 +694,3 @@ void test_refs_revparse__parses_range_operator(void)
 		"a65fedf39aefe402d3bb6e24df4d4f5fe4547750",
 		GIT_REVPARSE_RANGE | GIT_REVPARSE_MERGE_BASE);
 }
-

tests-clar/status/submodules.c

@@ -219,4 +219,3 @@ void test_status_submodules__dirty_workdir_only(void)
 		git_status_foreach_ext(g_repo, &opts, cb_status__match, &counts));
 	cl_assert_equal_i(6, counts.entry_count);
 }
-

tests-clar/trace/trace.c

@@ -85,4 +85,3 @@ void test_trace_trace__writes_lower_level(void)
 	cl_assert(written == 1);
 #endif
 }
-