From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Mon, 10 Aug 2015 09:47:50 +0000 (+0200)
Subject: credential-cache--daemon: delete socket from main()
X-Git-Tag: v2.6.0-rc0~46^2~1
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=18a3de4214668b5b82561ec096f7ef6858d25555;p=git.git

credential-cache--daemon: delete socket from main()

main() is responsible for cleaning up the socket in the case of
errors, so it is reasonable to also make it responsible for cleaning
it up when there are no errors. This change also makes the next step
easier.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/credential-cache--daemon.c b/credential-cache--daemon.c
index c2f00498f6..a671b2b53c 100644
--- a/credential-cache--daemon.c
+++ b/credential-cache--daemon.c
@@ -221,7 +221,6 @@ static void serve_cache(const char *socket_path, int debug)
 		; /* nothing */
 
 	close(fd);
-	unlink(socket_path);
 }
 
 static const char permissions_advice[] =
@@ -280,5 +279,7 @@ int main(int argc, const char **argv)
 
 	serve_cache(socket_path, debug);
 
+	unlink(socket_path);
+
 	return 0;
 }