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>

diff --git a/builtin/init-db.c b/builtin/init-db.c
index bfe1d08234ddeae1b36d2dc4447a933123cbda1c..69323e186cda73fe02658a535d8eae8387ff5444 100644 (file)
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -378,7 +378,7 @@ static void separate_git_dir(const char *git_dir)
                        die_errno(_("unable to move %s to %s"), src, 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)
 }
 
 int init_db(const char *template_dir, unsigned int flags)

diff --git a/builtin/worktree.c b/builtin/worktree.c
index 368502d8371474045e0e39541077795c1deee091..bbb169a5d05be7748134f4e5286bcdabb48d7aeb 100644 (file)
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -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);
         * 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))
 
        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);
 
        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
                   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);
                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);
        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);
 
 
        fprintf_ln(stderr, _("Enter %s (identifier %s)"), path, name);
 

diff --git a/daemon.c b/daemon.c
index 91545090a72e45e16626d1c54e30e5f507c28ce3..f9eb296888c37c8f2a523f3941be027ddb36df3c 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -1376,7 +1376,7 @@ int main(int argc, char **argv)
                sanitize_stdfds();
 
        if (pid_file)
                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));
 
        /* prepare argv for serving-processes */
        cld_argv = xmalloc(sizeof (char *) * (argc + 2));

diff --git a/setup.c b/setup.c
index feb85651ef4f9808505ae96b5fd954fd84642403..a206781d58d535887be3f8a86bfda56c5d119d95 100644 (file)
--- a/setup.c
+++ b/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))
 
        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);
 }
 
        strbuf_release(&path);
 }
 

diff --git a/submodule.c b/submodule.c
index 5519f11fdb1e078b5cebb3f38f295b0d2db29f92..4549c1baf4cb4d665ac53a2dd3aeb15029300d51 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -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);
 
        /* 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 */
                   relative_path(git_dir, real_work_tree, &rel_path));
 
        /* Update core.worktree setting */

diff --git a/transport.c b/transport.c
index 025439435629ad45c48840112a6ba672ffc39655..788cf2058502fedb9bc237139b3a0bc5efa29199 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -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) ||
 
        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);
                return error("problems writing temporary file %s: %s",
                             buf->buf, strerror(errno));
        strbuf_setlen(buf, len);