Merge branch 'np/delta' into next

[git.git] / http-push.c

diff --git a/http-push.c b/http-push.c
index c6e782cbed88edd68a764eac2f86887758dbec00..fe925609b4024119c6171dd32350a6570bea8516 100644 (file)
--- 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;
@@ -1274,6 +1272,9 @@ int main(int argc, char **argv)
                break;
        }
 
+       if (!remote->url)
+               usage(http_push_usage);
+
        memset(remote_dir_exists, 0, 256);
 
        http_init();