From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 2 Jul 2024 16:59:01 +0000 (-0700)
Subject: Merge branch 'jk/remote-wo-url'
X-Git-Tag: v2.46.0-rc0~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ca463101c8978910c45d9a053dc1af07d42a8664;p=thirdparty%2Fgit.git

Merge branch 'jk/remote-wo-url'

Memory ownership rules for the in-core representation of
remote.*.url configuration values have been straightened out, which
resulted in a few leak fixes and code clarification.

* jk/remote-wo-url:
  remote: drop checks for zero-url case
  remote: always require at least one url in a remote
  t5801: test remote.*.vcs config
  t5801: make remote-testgit GIT_DIR setup more robust
  remote: allow resetting url list
  config: document remote.*.url/pushurl interaction
  remote: simplify url/pushurl selection
  remote: use strvecs to store remote url/pushurl
  remote: transfer ownership of memory in add_url(), etc
  remote: refactor alias_url() memory ownership
  archive: fix check for missing url
---

ca463101c8978910c45d9a053dc1af07d42a8664
diff --cc remote.h
index ca1458dec2,034f9d6660..b901b56746
--- a/remote.h
+++ b/remote.h
@@@ -1,9 -1,10 +1,10 @@@
  #ifndef REMOTE_H
  #define REMOTE_H
  
 -#include "hash-ll.h"
 +#include "hash.h"
  #include "hashmap.h"
  #include "refspec.h"
+ #include "strvec.h"
  
  struct option;
  struct transport_ls_refs_options;