[PATCH] Quote LF in urls git fetch saves in FETCH_HEAD
- From
Alex Riesen <raa.lkml@gmail.com>
- Date
- May 12, 2009, 17:24 UTC
- Message-ID
- <20090512172452.GA32594@blimp.localdomain>
- In-Reply-To
- <81b0412b0905121018lbccda1fvf6c4c19417cdde00@mail.gmail.com>
The fmt-merge-msg does a strong syntax checking of its input and fails with if it is incorrect. The LF character is the only character important for fmt-merge-msg. As the url in FETCH_HEAD plays only informational role, a quoted representation of the url should be good and true enough. The url often comes from either user-editable config or command line, so it is reasonable to expect all kinds of characters in it, including the characters which the format of FETCH_HEAD considers special (line separator in this case).
Noticed and reported by Hugo Mildenberger.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com> ---
Alex Riesen, Tue, May 12, 2009 19:18:33 +0200:
Show 5 quoted lines
> 2009/5/12 Hugo Mildenberger <Hugo.Mildenberger@namir.de>: > > hm@localhost /var/tmp/bluetooth-testing.git $ git pull > > fatal: Error in line 2: > > That's already fixed. Will send the fix in a minute.
Here
builtin-fetch.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/builtin-fetch.c b/builtin-fetch.c index 3c998ea..eef7091 100644 --- a/builtin-fetch.c +++ b/builtin-fetch.c @@ -353,12 +353,17 @@ static int store_updated_refs(const char *url, const char *remote_name, kind); note_len += sprintf(note + note_len, "'%s' of ", what); } - note_len += sprintf(note + note_len, "%.*s", url_len, url); - fprintf(fp, "%s\t%s\t%s\n", + fprintf(fp, "%s\t%s\t%s", sha1_to_hex(commit ? commit->object.sha1 : rm->old_sha1), rm->merge ? "" : "not-for-merge", note); + for (i = 0; i < url_len; ++i) + if ('\n' == url[i]) + fputs("\\n", fp); + else + fputc(url[i], fp); + fputc('\n', fp); if (ref) rc |= update_local_ref(ref, what, note);
-- 1.6.3.28.ga852b