diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-08-24 09:43:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-24 13:01:59 -0700 |
| commit | 57c867efe4e005e40cfdee8a64550d7a95bbb9a0 (patch) | |
| tree | 9e7b8f7e0a6ea2be11e55cefd672c42895b08887 /builtin | |
| parent | builtin/am: introduce write_state_*() helper functions (diff) | |
| download | tgif-57c867efe4e005e40cfdee8a64550d7a95bbb9a0.tar.xz | |
builtin/am: make sure state files are text
We forgot to terminate the payload given to write_file() with LF,
resulting in files that end with an incomplete line. Teach the
wrappers builtin/am uses to make sure it adds LF at the end as
necessary.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/am.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/builtin/am.c b/builtin/am.c index 4d34dc5f74..f0a046bdc0 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -199,13 +199,19 @@ static inline const char *am_path(const struct am_state *state, const char *path static int write_state_text(const struct am_state *state, const char *name, const char *string) { - return write_file(am_path(state, name), 1, "%s", string); + const char *fmt; + + if (*string && string[strlen(string) - 1] != '\n') + fmt = "%s\n"; + else + fmt = "%s"; + return write_file(am_path(state, name), 1, fmt, string); } static int write_state_count(const struct am_state *state, const char *name, int value) { - return write_file(am_path(state, name), 1, "%d", value); + return write_file(am_path(state, name), 1, "%d\n", value); } static int write_state_bool(const struct am_state *state, |