Merge branch 'maint'

gitster · gitster · commit dcd8c09e4dd6 · 2013-04-16T15:14:44.000-07:00
* maint:
  help.c: add a compatibility comment to cmd_version()
diff --git a/help.c b/help.c
@@ -397,6 +397,10 @@ const char *help_unknown_cmd(const char *cmd)
 
 int cmd_version(int argc, const char **argv, const char *prefix)
 {
+	/*
+	 * The format of this string should be kept stable for compatibility
+	 * with external projects that rely on the output of "git version".
+	 */
 	printf("git version %s\n", git_version_string);
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -397,6 +397,10 @@ const char help_unknown_cmd(const char cmd)`
`397`	`397`
`398`	`398`	`int cmd_version(int argc, const char *argv, const char prefix)`
`399`	`399`	`{`
	`400`	`+ /*`
	`401`	`+ * The format of this string should be kept stable for compatibility`
	`402`	`+ * with external projects that rely on the output of "git version".`
	`403`	`+ */`
`400`	`404`	`printf("git version %s\n", git_version_string);`
`401`	`405`	`return 0;`
`402`	`406`	`}`