t6023: merge-file fails to output anything for a degenerate merge

diff --git a/http-push.c b/http-push.c
index 68052888570af7d09535db8831b8cf3ef2881589..0696da0fec5a4e1f2f089b1f47ff6bb88d1032e7 100644 (file)
--- 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;
        }
 }