From: Shawn O. Pearce <spearce@spearce.org>
Date: Fri, 14 Sep 2007 07:31:09 +0000 (-0400)
Subject: Fix off by one bug in reflog messages written by builtin-fetch
X-Git-Tag: v1.5.4-rc0~325^2~46
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=4ad1eada9774a1f340beb4fdf78f1735534741bb;p=git.git

Fix off by one bug in reflog messages written by builtin-fetch

We are adding a space between each argument in the sprintf above
so we must account for this as we update our position within the
reflog message and append in any remaining arguments.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin-fetch.c b/builtin-fetch.c
index c8c24d28a..016c6e43e 100644
--- a/builtin-fetch.c
+++ b/builtin-fetch.c
@@ -503,7 +503,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 	rla_offset = strlen(default_rla);
 	for (j = 1; j < argc; j++) {
 		sprintf(default_rla + rla_offset, " %s", argv[j]);
-		rla_offset += strlen(argv[j]);
+		rla_offset += strlen(argv[j]) + 1;
 	}
 
 	if (i == argc)