Simplify cases where a strbuf_reset is immediately followed by a strbuf_add by using strbuf_set operations. Signed-off-by: Jeremiah Mahler <jmmahler@xxxxxxxxx> --- submodule.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/submodule.c b/submodule.c index 3402af6..878cc48 100644 --- a/submodule.c +++ b/submodule.c @@ -1324,13 +1324,12 @@ void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir) const char *real_work_tree = xstrdup(real_path(work_tree)); /* Update gitfile */ - strbuf_addf(&file_name, "%s/.git", work_tree); + strbuf_setf(&file_name, "%s/.git", work_tree); write_file(file_name.buf, 1, "gitdir: %s\n", relative_path(real_git_dir, real_work_tree, &rel_path)); /* Update core.worktree setting */ - strbuf_reset(&file_name); - strbuf_addf(&file_name, "%s/config", real_git_dir); + strbuf_setf(&file_name, "%s/config", real_git_dir); if (git_config_set_in_file(file_name.buf, "core.worktree", relative_path(real_work_tree, real_git_dir, &rel_path))) -- 2.0.0.592.gf55b190 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html