Merge branch 'rs/commit-export-env-simplify'

gitster · gitster · commit e3b72391d1ab · 2019-12-16T13:14:47.000-08:00
Code cleanup.

* rs/commit-export-env-simplify:
  commit: use strbuf_add() to add a length-limited string
diff --git a/builtin/commit.c b/builtin/commit.c
@@ -554,7 +554,7 @@ static void export_one(const char *var, const char *s, const char *e, int hack)
 	struct strbuf buf = STRBUF_INIT;
 	if (hack)
 		strbuf_addch(&buf, hack);
-	strbuf_addf(&buf, "%.*s", (int)(e - s), s);
+	strbuf_add(&buf, s, e - s);
 	setenv(var, buf.buf, 1);
 	strbuf_release(&buf);
 }

Original file line number	Diff line number	Diff line change
`@@ -554,7 +554,7 @@ static void export_one(const char var, const char s, const char *e, int hack)`
`554`	`554`	`struct strbuf buf = STRBUF_INIT;`
`555`	`555`	`if (hack)`
`556`	`556`	`strbuf_addch(&buf, hack);`
`557`		`- strbuf_addf(&buf, "%.*s", (int)(e - s), s);`
	`557`	`+ strbuf_add(&buf, s, e - s);`
`558`	`558`	`setenv(var, buf.buf, 1);`
`559`	`559`	`strbuf_release(&buf);`
`560`	`560`	`}`