diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-31 15:39:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-31 15:39:03 -0700 |
| commit | d75bb73bcf2ecce38c147980aac0cbc27a6b838a (patch) | |
| tree | 915571f195467d0a8b441455a94d6dca3c95f697 /submodule.c | |
| parent | 2ba6183b0b809ff10ec212e1f7b4c9f72fc076ae (diff) | |
| parent | 1f76a10b2d72245332ac41bd79249cb82f3946f0 (diff) | |
| download | git-d75bb73bcf2ecce38c147980aac0cbc27a6b838a.tar.gz | |
Merge branch 'jc/am-state-fix'
Recent reimplementation of "git am" changed the format of state
files kept in $GIT_DIR/rebase-apply/ without meaning to do so,
primarily because write_file() API was cumbersome to use and it was
easy to mistakenly make text files with incomplete lines. Update
write_file() interface to make it harder to misuse.
* jc/am-state-fix:
write_file(): drop caller-supplied LF from calls to create a one-liner file
write_file_v(): do not leave incomplete line at the end
write_file(): drop "fatal" parameter
builtin/am: make sure state files are text
builtin/am: introduce write_state_*() helper functions
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 9fcc86faa2..245ed4dfbb 100644 --- a/submodule.c +++ b/submodule.c @@ -1033,7 +1033,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", relative_path(git_dir, real_work_tree, &rel_path)); /* Update core.worktree setting */ |