From: Nick Hengeveld <nickh@reactrix.com>
Date: Tue, 29 Nov 2005 17:33:36 +0000 (-0800)
Subject: http-push cleanup
X-Git-Tag: v0.99.9l^2~32
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3e9fabc85ef44fa0f275dd89738a2dacb7b6f5db;p=git.git

http-push cleanup

The malloc patch from Jan Andres fixed the problem that was causing a
segfault when freeing the lock token, and Johannes Schindelin found
and fixed a problem when no URL is specified on the command line.

Signed-off-by: Nick Hengeveld <nickh@reactrix.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/http-push.c b/http-push.c
index ad789829c..fc013ec13 100644
--- a/http-push.c
+++ b/http-push.c
@@ -1008,9 +1008,7 @@ static int unlock_remote(struct active_lock *lock)
 	if (lock->owner != NULL)
 		free(lock->owner);
 	free(lock->url);
-/* Freeing the token causes a segfault...
 	free(lock->token);
-*/
 	free(lock);
 
 	return rc;
@@ -1273,6 +1271,9 @@ int main(int argc, char **argv)
 		break;
 	}
 
+	if (!remote->url)
+		usage(http_push_usage);
+
 	memset(remote_dir_exists, 0, 256);
 
 	http_init();