From: Junio C Hamano <junkio@cox.net>
Date: Thu, 1 Mar 2007 01:02:18 +0000 (-0800)
Subject: builtin-fetch--tool: fix reflog notes.
X-Git-Tag: v1.5.1-rc1~30^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=855b34680ea334f05385b3ad58232c3ccdca51d5;p=git.git

builtin-fetch--tool: fix reflog notes.

Also the verbose output had unnecessary SHA1 and not-for-merge markers
leaked because append_fetch_head() cheated

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/builtin-fetch--tool.c b/builtin-fetch--tool.c
index 5261bf57f..e9d676455 100644
--- a/builtin-fetch--tool.c
+++ b/builtin-fetch--tool.c
@@ -181,16 +181,18 @@ static int append_fetch_head(FILE *fp,
 	remote_len = i + 1;
 	if (4 < i && !strncmp(".git", remote + i - 3, 4))
 		remote_len = i - 3;
-	note_len = sprintf(note, "%s\t%s\t",
-			   sha1_to_hex(commit ? commit->object.sha1 : sha1),
-			   not_for_merge ? "not-for-merge" : "");
+
+	note_len = 0;
 	if (*what) {
 		if (*kind)
 			note_len += sprintf(note + note_len, "%s ", kind);
 		note_len += sprintf(note + note_len, "'%s' of ", what);
 	}
 	note_len += sprintf(note + note_len, "%.*s", remote_len, remote);
-	fprintf(fp, "%s\n", note);
+	fprintf(fp, "%s\t%s\t%s\n",
+		sha1_to_hex(commit ? commit->object.sha1 : sha1),
+		not_for_merge ? "not-for-merge" : "",
+		note);
 	return update_local_ref(local_name, head, note, verbose, force);
 }