From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 7 Jun 2024 17:32:02 +0000 (-0700)
Subject: Merge branch 'ps/no-writable-strings' into jk/imap-send-plug-all-msgs-leak
X-Git-Tag: v2.46.0-rc0~51^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=79864519637f58c79d15ec5b49272c0580201af3;p=thirdparty%2Fgit.git

Merge branch 'ps/no-writable-strings' into jk/imap-send-plug-all-msgs-leak

* ps/no-writable-strings: (46 commits)
  config.mak.dev: enable `-Wwrite-strings` warning
  builtin/merge: always store allocated strings in `pull_twohead`
  builtin/rebase: always store allocated string in `options.strategy`
  builtin/rebase: do not assign default backend to non-constant field
  imap-send: fix leaking memory in `imap_server_conf`
  imap-send: drop global `imap_server_conf` variable
  mailmap: always store allocated strings in mailmap blob
  revision: always store allocated strings in output encoding
  remote-curl: avoid assigning string constant to non-const variable
  send-pack: always allocate receive status
  parse-options: cast long name for OPTION_ALIAS
  http: do not assign string constant to non-const field
  compat/win32: fix const-correctness with string constants
  pretty: add casts for decoration option pointers
  object-file: make `buf` parameter of `index_mem()` a constant
  object-file: mark cached object buffers as const
  ident: add casts for fallback name and GECOS
  entry: refactor how we remove items for delayed checkouts
  line-log: always allocate the output prefix
  line-log: stop assigning string constant to file parent buffer
  ...
---

79864519637f58c79d15ec5b49272c0580201af3
diff --cc reftable/stack_test.c
index 0f7b1453e6,4abf92636d..aae5d011cd
--- a/reftable/stack_test.c
+++ b/reftable/stack_test.c
@@@ -406,19 -409,19 +406,19 @@@ static void test_reftable_stack_update_
  	struct reftable_stack *st = NULL;
  	int err;
  	struct reftable_ref_record ref1 = {
- 		.refname = "name1",
+ 		.refname = (char *) "name1",
  		.update_index = 1,
  		.value_type = REFTABLE_REF_SYMREF,
- 		.value.symref = "master",
+ 		.value.symref = (char *) "master",
  	};
  	struct reftable_ref_record ref2 = {
- 		.refname = "name2",
+ 		.refname = (char *) "name2",
  		.update_index = 1,
  		.value_type = REFTABLE_REF_SYMREF,
- 		.value.symref = "master",
+ 		.value.symref = (char *) "master",
  	};
  
 -	err = reftable_new_stack(&st, dir, cfg);
 +	err = reftable_new_stack(&st, dir, &opts);
  	EXPECT_ERR(err);
  
  	err = reftable_stack_add(st, &write_test_ref, &ref1);
@@@ -575,10 -579,10 +575,10 @@@ static void test_reftable_stack_log_nor
  		.update_index = 1,
  	};
  
 -	err = reftable_new_stack(&st, dir, cfg);
 +	err = reftable_new_stack(&st, dir, &opts);
  	EXPECT_ERR(err);
  
- 	input.value.update.message = "one\ntwo";
+ 	input.value.update.message = (char *) "one\ntwo";
  	err = reftable_stack_add(st, &write_test_log, &arg);
  	EXPECT(err == REFTABLE_API_ERROR);
  
@@@ -690,14 -697,14 +690,14 @@@ static void test_reftable_stack_hash_id
  	int err;
  
  	struct reftable_ref_record ref = {
- 		.refname = "master",
+ 		.refname = (char *) "master",
  		.value_type = REFTABLE_REF_SYMREF,
- 		.value.symref = "target",
+ 		.value.symref = (char *) "target",
  		.update_index = 1,
  	};
 -	struct reftable_write_options cfg32 = { .hash_id = GIT_SHA256_FORMAT_ID };
 +	struct reftable_write_options opts32 = { .hash_id = GIT_SHA256_FORMAT_ID };
  	struct reftable_stack *st32 = NULL;
 -	struct reftable_write_options cfg_default = { 0 };
 +	struct reftable_write_options opts_default = { 0 };
  	struct reftable_stack *st_default = NULL;
  	struct reftable_ref_record dest = { NULL };