merge-recursive: Fix sorting order and directory change assumptions

diff --git a/http-walker.c b/http-walker.c
index 8ca76d0507bdc1d95283e1f5fee3f88180cdce26..9bc8114c3bb2f6f87f7f61962a64c4e5b012dcf8 100644 (file)
--- a/http-walker.c
+++ b/http-walker.c
@@ -3,8 +3,7 @@
 #include "walker.h"
 #include "http.h"
 
-struct alt_base
-{
+struct alt_base {
        char *base;
        int got_indices;
        struct packed_git *packs;
@@ -15,11 +14,10 @@ enum object_request_state {
        WAITING,
        ABORTED,
        ACTIVE,
-       COMPLETE,
+       COMPLETE
 };
 
-struct object_request
-{
+struct object_request {
        struct walker *walker;
        unsigned char sha1[20];
        struct alt_base *repo;