Merge branch 'maint'

* maint: Change C99 comments to old-style C comments
2010-06-07 22:15:31 -07:00
parent 4a2b34eb0c 2543d9b609
commit 92a75a391e
3 changed files with 4 additions and 4 deletions
--- a/remote.c
+++ b/remote.c
@ -478,7 +478,7 @@ static void read_config(void)
 	unsigned char sha1[20];
 	const char *head_ref;
 	int flag;
-	if (default_remote_name) // did this already
+	if (default_remote_name) /* did this already */
 		return;
 	default_remote_name = xstrdup("origin");
 	current_branch = NULL;