diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-08-24 14:54:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-24 14:54:30 -0700 |
| commit | ff20794402177adc52cab849b98fc85f3c2da739 (patch) | |
| tree | d1feaa58edb34788e38ba0cbef3b4e2018ab4614 /builtin | |
| parent | Merge branch 'en/dir-nonbare-embedded' (diff) | |
| parent | ls-remote: simplify UNLEAK() usage (diff) | |
| download | tgif-ff20794402177adc52cab849b98fc85f3c2da739.tar.xz | |
Merge branch 'jk/unleak-fixes'
Fix some incorrect UNLEAK() annotations.
* jk/unleak-fixes:
ls-remote: simplify UNLEAK() usage
stop calling UNLEAK() before die()
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/ls-remote.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c index ea91679f33..092917eca2 100644 --- a/builtin/ls-remote.c +++ b/builtin/ls-remote.c @@ -83,6 +83,8 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix) PARSE_OPT_STOP_AT_NON_OPTION); dest = argv[0]; + UNLEAK(sorting); + if (argc > 1) { int i; pattern = xcalloc(argc, sizeof(const char *)); @@ -107,7 +109,6 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix) if (get_url) { printf("%s\n", *remote->url); - UNLEAK(sorting); return 0; } @@ -122,10 +123,8 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix) int hash_algo = hash_algo_by_ptr(transport_get_hash_algo(transport)); repo_set_hash_algo(the_repository, hash_algo); } - if (transport_disconnect(transport)) { - UNLEAK(sorting); + if (transport_disconnect(transport)) return 1; - } if (!dest && !quiet) fprintf(stderr, "From %s\n", *remote->url); @@ -150,7 +149,6 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix) status = 0; /* we found something */ } - UNLEAK(sorting); ref_array_clear(&ref_array); return status; } |