X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=vcs-svn%2Frepo_tree.c;h=491f0135a798f518fe2d226c9d01af90e6dac736;hb=d0ef5a7e427d18657b8d53223adc1d7132d6ab79;hp=e3d1fa35444dd693ab8723a030b9fc6265cad8bc;hpb=cfa775c10ef698c7b84e2d460d04272993c30da4;p=git.git diff --git a/vcs-svn/repo_tree.c b/vcs-svn/repo_tree.c index e3d1fa354..491f0135a 100644 --- a/vcs-svn/repo_tree.c +++ b/vcs-svn/repo_tree.c @@ -175,25 +175,18 @@ void repo_add(uint32_t *path, uint32_t mode, uint32_t blob_mark) repo_write_dirent(path, mode, blob_mark, 0); } -uint32_t repo_replace(uint32_t *path, uint32_t blob_mark) +uint32_t repo_modify_path(uint32_t *path, uint32_t mode, uint32_t blob_mark) { - uint32_t mode = 0; struct repo_dirent *src_dent; src_dent = repo_read_dirent(active_commit, path); - if (src_dent != NULL) { - mode = src_dent->mode; - repo_write_dirent(path, mode, blob_mark, 0); - } - return mode; -} - -void repo_modify(uint32_t *path, uint32_t mode, uint32_t blob_mark) -{ - struct repo_dirent *src_dent; - src_dent = repo_read_dirent(active_commit, path); - if (src_dent != NULL && blob_mark == 0) + if (!src_dent) + return 0; + if (!blob_mark) blob_mark = src_dent->content_offset; + if (!mode) + mode = src_dent->mode; repo_write_dirent(path, mode, blob_mark, 0); + return mode; } void repo_delete(uint32_t *path)