diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-24 13:03:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-24 13:09:02 -0700 |
| commit | 12d6ce1dba504dfc5279b8d24da3edb4865c2820 (patch) | |
| tree | b986a6e22bf290aa4f74d566169a6d54db6e4f3f /submodule.c | |
| parent | 57c867efe4e005e40cfdee8a64550d7a95bbb9a0 (diff) | |
| download | git-12d6ce1dba504dfc5279b8d24da3edb4865c2820.tar.gz | |
write_file(): drop "fatal" parameter
All callers except three passed 1 for the "fatal" parameter to ask
this function to die upon error, but to a casual reader of the code,
it was not all obvious what that 1 meant. Instead, split the
function into two based on a common write_file_v() that takes the
flag, introduce write_file_gently() as a new way to attempt creating
a file without dying on error, and make three callers to call it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/submodule.c b/submodule.c index 700bbf4fcb..5519f11fdb 100644 --- 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); - write_file(file_name.buf, 1, "gitdir: %s\n", + write_file(file_name.buf, "gitdir: %s\n", relative_path(git_dir, real_work_tree, &rel_path)); /* Update core.worktree setting */ |