зеркало из https://github.com/microsoft/git.git
write_file(): drop caller-supplied LF from calls to create a one-liner file
All of the callsites covered by this change call write_file() or write_file_gently() to create a one-liner file. Drop the caller supplied LF and let these callees to append it as necessary. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
e7ffa38c6e
Коммит
1f76a10b2d
|
@ -378,7 +378,7 @@ static void separate_git_dir(const char *git_dir)
|
|||
die_errno(_("unable to move %s to %s"), src, git_dir);
|
||||
}
|
||||
|
||||
write_file(git_link, "gitdir: %s\n", git_dir);
|
||||
write_file(git_link, "gitdir: %s", git_dir);
|
||||
}
|
||||
|
||||
int init_db(const char *template_dir, unsigned int flags)
|
||||
|
|
|
@ -213,7 +213,7 @@ static int add_worktree(const char *path, const char **child_argv)
|
|||
* after the preparation is over.
|
||||
*/
|
||||
strbuf_addf(&sb, "%s/locked", sb_repo.buf);
|
||||
write_file(sb.buf, "initializing\n");
|
||||
write_file(sb.buf, "initializing");
|
||||
|
||||
strbuf_addf(&sb_git, "%s/.git", path);
|
||||
if (safe_create_leading_directories_const(sb_git.buf))
|
||||
|
@ -223,8 +223,8 @@ static int add_worktree(const char *path, const char **child_argv)
|
|||
|
||||
strbuf_reset(&sb);
|
||||
strbuf_addf(&sb, "%s/gitdir", sb_repo.buf);
|
||||
write_file(sb.buf, "%s\n", real_path(sb_git.buf));
|
||||
write_file(sb_git.buf, "gitdir: %s/worktrees/%s\n",
|
||||
write_file(sb.buf, "%s", real_path(sb_git.buf));
|
||||
write_file(sb_git.buf, "gitdir: %s/worktrees/%s",
|
||||
real_path(get_git_common_dir()), name);
|
||||
/*
|
||||
* This is to keep resolve_ref() happy. We need a valid HEAD
|
||||
|
@ -241,10 +241,10 @@ static int add_worktree(const char *path, const char **child_argv)
|
|||
die(_("unable to resolve HEAD"));
|
||||
strbuf_reset(&sb);
|
||||
strbuf_addf(&sb, "%s/HEAD", sb_repo.buf);
|
||||
write_file(sb.buf, "%s\n", sha1_to_hex(rev));
|
||||
write_file(sb.buf, "%s", sha1_to_hex(rev));
|
||||
strbuf_reset(&sb);
|
||||
strbuf_addf(&sb, "%s/commondir", sb_repo.buf);
|
||||
write_file(sb.buf, "../..\n");
|
||||
write_file(sb.buf, "../..");
|
||||
|
||||
fprintf_ln(stderr, _("Enter %s (identifier %s)"), path, name);
|
||||
|
||||
|
|
2
daemon.c
2
daemon.c
|
@ -1376,7 +1376,7 @@ int main(int argc, char **argv)
|
|||
sanitize_stdfds();
|
||||
|
||||
if (pid_file)
|
||||
write_file(pid_file, "%"PRIuMAX"\n", (uintmax_t) getpid());
|
||||
write_file(pid_file, "%"PRIuMAX, (uintmax_t) getpid());
|
||||
|
||||
/* prepare argv for serving-processes */
|
||||
cld_argv = xmalloc(sizeof (char *) * (argc + 2));
|
||||
|
|
2
setup.c
2
setup.c
|
@ -404,7 +404,7 @@ static void update_linked_gitdir(const char *gitfile, const char *gitdir)
|
|||
|
||||
strbuf_addf(&path, "%s/gitfile", gitdir);
|
||||
if (stat(path.buf, &st) || st.st_mtime + 24 * 3600 < time(NULL))
|
||||
write_file_gently(path.buf, "%s\n", gitfile);
|
||||
write_file_gently(path.buf, "%s", gitfile);
|
||||
strbuf_release(&path);
|
||||
}
|
||||
|
||||
|
|
|
@ -1103,7 +1103,7 @@ void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir)
|
|||
|
||||
/* Update gitfile */
|
||||
strbuf_addf(&file_name, "%s/.git", work_tree);
|
||||
write_file(file_name.buf, "gitdir: %s\n",
|
||||
write_file(file_name.buf, "gitdir: %s",
|
||||
relative_path(git_dir, real_work_tree, &rel_path));
|
||||
|
||||
/* Update core.worktree setting */
|
||||
|
|
|
@ -291,7 +291,7 @@ static int write_one_ref(const char *name, const struct object_id *oid,
|
|||
|
||||
strbuf_addstr(buf, name);
|
||||
if (safe_create_leading_directories(buf->buf) ||
|
||||
write_file_gently(buf->buf, "%s\n", oid_to_hex(oid)))
|
||||
write_file_gently(buf->buf, "%s", oid_to_hex(oid)))
|
||||
return error("problems writing temporary file %s: %s",
|
||||
buf->buf, strerror(errno));
|
||||
strbuf_setlen(buf, len);
|
||||
|
|
Загрузка…
Ссылка в новой задаче