Merge branch 'maint-1.5.6' into maint-1.6.0

[git.git] / http-push.c
diff --git a/http-push.c b/http-push.c

index 2cd068a6f1ef0199cc27a1564678c91b66237a9b..0696da0fec5a4e1f2f089b1f47ff6bb88d1032e7 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -14,7 +14,7 @@
  #include <expat.h>
  
  static const char http_push_usage[] =
-"git-http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\n";
+"git http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\n";
  
  #ifndef XML_STATUS_OK
  enum XML_Status {
@@ -1356,8 +1356,9 @@ static void remove_locks(void)
  
         fprintf(stderr, "Removing remote locks...\n");
         while (lock) {
+               struct remote_lock *next = lock->next;
                 unlock_remote(lock);
-               lock = lock->next;
+               lock = next;
         }
  }