proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-30 22:24:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix filemode updating in diff text

Browse Source
This commit is contained in:
Russell Belfer 2014-01-21 11:36:43 -08:00
parent 2c65602e45
commit 9bbc53d6d4
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/diff/drivers.c
View File

@ -15,13 +15,21 @@ void test_diff_drivers__cleanup(void)
g_repo = NULL; g_repo = NULL;
} }
static void overwrite_chmod_at_offset(git_buf *buf, size_t offset) static void overwrite_filemode(const char *expected, git_buf *actual)
{ {
if (cl_is_chmod_supported()) size_t offset;
char *found;
found = strstr(expected, "100644");
if (!found)
return; return;
if (buf->size > offset + 6 && memcmp(&buf->ptr[offset], "100644", 6) != 0) offset = ((const char *)found) - expected;
memcpy(&buf->ptr[offset], "100644", 6); if (actual->size < offset + 6)
return;
if (memcmp(&actual->ptr[offset], "100644", 6) != 0)
memcpy(&actual->ptr[offset], "100644", 6);
} }
void test_diff_drivers__patterns(void) void test_diff_drivers__patterns(void)
@ -157,7 +165,7 @@ void test_diff_drivers__long_lines(void)
cl_git_pass(git_patch_to_buf(&actual, patch)); cl_git_pass(git_patch_to_buf(&actual, patch));
/* if chmod not supported, overwrite mode bits since anything is possible */ /* if chmod not supported, overwrite mode bits since anything is possible */
overwrite_chmod_at_offset(&actual, 66); overwrite_filemode(expected, &actual);
cl_assert_equal_s(expected, actual.ptr); cl_assert_equal_s(expected, actual.ptr);
@ -210,7 +218,7 @@ void test_diff_drivers__builtins(void)
cl_git_pass(git_patch_from_diff(&patch, diff, 0)); cl_git_pass(git_patch_from_diff(&patch, diff, 0));
cl_git_pass(git_patch_to_buf(&actual, patch)); cl_git_pass(git_patch_to_buf(&actual, patch));
overwrite_chmod_at_offset(&actual, 59); overwrite_filemode(expected_nodriver, &actual);
cl_assert_equal_s(expected_nodriver, actual.ptr); cl_assert_equal_s(expected_nodriver, actual.ptr);
@ -227,7 +235,7 @@ void test_diff_drivers__builtins(void)
cl_git_pass(git_patch_from_diff(&patch, diff, 0)); cl_git_pass(git_patch_from_diff(&patch, diff, 0));
cl_git_pass(git_patch_to_buf(&actual, patch)); cl_git_pass(git_patch_to_buf(&actual, patch));
overwrite_chmod_at_offset(&actual, 59); overwrite_filemode(expected_driver, &actual);
cl_assert_equal_s(expected_driver, actual.ptr); cl_assert_equal_s(expected_driver, actual.ptr);