]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/remote-wo-url'
authorJunio C Hamano <gitster@pobox.com>
Tue, 2 Jul 2024 16:59:01 +0000 (09:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Jul 2024 16:59:01 +0000 (09:59 -0700)
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

1  2 
builtin/clone.c
builtin/ls-remote.c
builtin/remote.c
remote-curl.c
remote.c
remote.h
transport.c

diff --cc builtin/clone.c
Simple merge
Simple merge
Simple merge
diff --cc remote-curl.c
Simple merge
diff --cc remote.c
Simple merge
diff --cc remote.h
index ca1458dec2948d7ed4f64d27a4ee28ac9a251a84,034f9d666067e9bda3a778766ed200009857084b..b901b56746dfec31a54d1c7b0fca10958d860e4a
+++ 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;
diff --cc transport.c
Simple merge