Merge branch 'maint-1.6.0' into maint-1.6.1

* maint-1.6.0:
  git-rerere.txt: grammatical fixups and cleanups
  http-push.c::remove_locks(): fix use after free

1 files changed, 2 insertions, 1 deletions

diff --git a/http-push.c b/http-push.c
index cb5bf95a73..f743c9796a 100644
--- a/http-push.c
+++ b/http-push.c
@@ -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;
 	}
 }