mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-05 07:54:05 +00:00
Fix trailing whitespaces
This commit is contained in:
parent
f0ab73720a
commit
1fed6b07f0
@ -117,4 +117,3 @@ int main (int argc, char **argv)
|
|||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -177,4 +177,3 @@ GIT_EXTERN(void) git_index_reuc_clear(git_index *index);
|
|||||||
/** @} */
|
/** @} */
|
||||||
GIT_END_DECL
|
GIT_END_DECL
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -65,4 +65,3 @@ GIT_EXTERN(int) git_trace_set(git_trace_level_t level, git_trace_callback cb);
|
|||||||
/** @} */
|
/** @} */
|
||||||
GIT_END_DECL
|
GIT_END_DECL
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -365,4 +365,3 @@ int git_hashsig_compare(const git_hashsig *a, const git_hashsig *b)
|
|||||||
return (hashsig_heap_compare(&a->mins, &b->mins) +
|
return (hashsig_heap_compare(&a->mins, &b->mins) +
|
||||||
hashsig_heap_compare(&a->maxs, &b->maxs)) / 2;
|
hashsig_heap_compare(&a->maxs, &b->maxs)) / 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1628,4 +1628,3 @@ void git_merge_diff_list__free(git_merge_diff_list *diff_list)
|
|||||||
git_pool_clear(&diff_list->pool);
|
git_pool_clear(&diff_list->pool);
|
||||||
git__free(diff_list);
|
git__free(diff_list);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -172,4 +172,3 @@ int git_merge_files(
|
|||||||
done:
|
done:
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -855,4 +855,3 @@ int git_revparse(
|
|||||||
|
|
||||||
return error;
|
return error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -36,4 +36,3 @@ int git_trace_set(git_trace_level_t level, git_trace_callback callback)
|
|||||||
return -1;
|
return -1;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -235,4 +235,3 @@ int git_win32__find_xdg_dirs(git_buf *out)
|
|||||||
|
|
||||||
return win32_find_existing_dirs(out, global_tmpls, temp);
|
return win32_find_existing_dirs(out, global_tmpls, temp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -250,4 +250,3 @@ void test_merge_trees_renames__no_rename_index(void)
|
|||||||
|
|
||||||
git_index_free(index);
|
git_index_free(index);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -481,7 +481,6 @@ void test_merge_trees_treediff__rename_conflicts(void)
|
|||||||
GIT_MERGE_DIFF_BOTH_RENAMED_2_TO_1,
|
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);
|
TREE_OID_RENAME_CONFLICT_OURS, TREE_OID_RENAME_CONFLICT_THEIRS, treediff_conflict_data, 18);
|
||||||
}
|
}
|
||||||
|
@ -694,4 +694,3 @@ void test_refs_revparse__parses_range_operator(void)
|
|||||||
"a65fedf39aefe402d3bb6e24df4d4f5fe4547750",
|
"a65fedf39aefe402d3bb6e24df4d4f5fe4547750",
|
||||||
GIT_REVPARSE_RANGE | GIT_REVPARSE_MERGE_BASE);
|
GIT_REVPARSE_RANGE | GIT_REVPARSE_MERGE_BASE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -219,4 +219,3 @@ void test_status_submodules__dirty_workdir_only(void)
|
|||||||
git_status_foreach_ext(g_repo, &opts, cb_status__match, &counts));
|
git_status_foreach_ext(g_repo, &opts, cb_status__match, &counts));
|
||||||
cl_assert_equal_i(6, counts.entry_count);
|
cl_assert_equal_i(6, counts.entry_count);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -85,4 +85,3 @@ void test_trace_trace__writes_lower_level(void)
|
|||||||
cl_assert(written == 1);
|
cl_assert(written == 1);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user