Merge branch 'nd/indent-fix-connect-c'

gitster · gitster · commit 34a2e88ae28a · 2014-03-25T11:07:06.000-07:00
* nd/indent-fix-connect-c:
  connect.c: SP after "}", not TAB
diff --git a/connect.c b/connect.c
@@ -727,7 +727,7 @@ struct child_process *git_connect(int fd[2], const char *url,
 				*arg++ = port;
 			}
 			*arg++ = ssh_host;
-		}	else {
+		} else {
 			/* remove repo-local variables from the environment */
 			conn->env = local_repo_env;
 			conn->use_shell = 1;

Original file line number	Diff line number	Diff line change
`@@ -727,7 +727,7 @@ struct child_process git_connect(int fd[2], const char url,`
`727`	`727`	`*arg++ = port;`
`728`	`728`	`}`
`729`	`729`	`*arg++ = ssh_host;`
`730`		`- } else {`
	`730`	`+ } else {`
`731`	`731`	`/* remove repo-local variables from the environment */`
`732`	`732`	`conn->env = local_repo_env;`
`733`	`733`	`conn->use_shell = 1;`