Merge branch 'tc/fetch-leak'
authorJunio C Hamano <gitster@pobox.com>
Tue, 18 Oct 2011 04:37:12 +0000 (21:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Oct 2011 04:37:12 +0000 (21:37 -0700)
* tc/fetch-leak:
  fetch: plug two leaks on error exit in store_updated_refs

Conflicts:
builtin/fetch.c

1  2 
builtin/fetch.c

diff --cc builtin/fetch.c
index 7a4e41cca75b87d3e5a7c4690658d9879777e965,db2c5d905b4c584bc1a9fd60392930e239fbd615..1adf6c176f31b2ece263bc1f07eee8c7e0b40098
@@@ -378,9 -423,10 +378,11 @@@ static int store_updated_refs(const cha
        else
                url = xstrdup("foreign");
  
 -      if (check_everything_connected(ref_map, 0)) {
 +      rm = ref_map;
-       if (check_everything_connected(iterate_ref_map, 0, &rm))
-               return error(_("%s did not send all necessary objects\n"), url);
++      if (check_everything_connected(iterate_ref_map, 0, &rm)) {
+               rc = error(_("%s did not send all necessary objects\n"), url);
+               goto abort;
+       }
  
        for (rm = ref_map; rm; rm = rm->next) {
                struct ref *ref = NULL;