git-wrapper: let git gui run in the background

gix · dscho · commit 38dc94dee5d7 · 2015-08-30T18:50:17.000+02:00
This fixes git-for-windows#172. Signed-off-by: Nico Rieck <nico.rieck@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
diff --git a/compat/win32/git-wrapper.c b/compat/win32/git-wrapper.c
@@ -163,6 +163,10 @@ static LPWSTR fixup_commandline(LPWSTR exepath, LPWSTR *exep, int *wait,
 		}
 		wcscat(cmd, p);
 	}
+
+	if (wargc > 1 && !wcscmp(wargv[1], L"gui"))
+		*wait = 0;
+
 	LocalFree(wargv);
 
 	return cmd;
@@ -342,6 +346,7 @@ int main(void)
 	}
 	else if (!wcsicmp(basename, L"git-gui.exe")) {
 		static WCHAR buffer[BUFSIZE];
+		wait = 0;
 		allocate_console = 1;
 		if (!PathRemoveFileSpec(exepath)) {
 			fwprintf(stderr,

Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,10 @@ static LPWSTR fixup_commandline(LPWSTR exepath, LPWSTR exep, int wait,`
`163`	`163`	`}`
`164`	`164`	`wcscat(cmd, p);`
`165`	`165`	`}`
	`166`	`+`
	`167`	`+ if (wargc > 1 && !wcscmp(wargv[1], L"gui"))`
	`168`	`+ *wait = 0;`
	`169`	`+`
`166`	`170`	`LocalFree(wargv);`
`167`	`171`
`168`	`172`	`return cmd;`
`@@ -342,6 +346,7 @@ int main(void)`
`342`	`346`	`}`
`343`	`347`	`else if (!wcsicmp(basename, L"git-gui.exe")) {`
`344`	`348`	`static WCHAR buffer[BUFSIZE];`
	`349`	`+ wait = 0;`
`345`	`350`	`allocate_console = 1;`
`346`	`351`	`if (!PathRemoveFileSpec(exepath)) {`
`347`	`352`	`fwprintf(stderr,`