admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jc/strbuf-split'

Browse Source 
Arrays of strbuf is often a wrong data structure to use, and
strbuf_split*() family of functions that create them often have
better alternatives.

Update several code paths and replace strbuf_split*().

* jc/strbuf-split:
  trace2: do not use strbuf_split*()
  trace2: trim_trailing_newline followed by trim is a no-op
  sub-process: do not use strbuf_split*()
  environment: do not use strbuf_split*()
  config: do not use strbuf_split()
  notes: do not use strbuf_split*()
  merge-tree: do not use strbuf_split*()
  clean: do not use strbuf_split*() [part 2]
  clean: do not pass the whole structure when it is not necessary
  clean: do not use strbuf_split*() [part 1]
  clean: do not pass strbuf by value
  wt-status: avoid strbuf_split*()
This commit is contained in:
Junio C Hamano
2025-08-21 13:47:00 -07:00
parent 971ba42dd4 838fe56920
commit 54fef16542
8 changed files with 129 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
builtin/merge-tree.c
View File

@@ -619,32 +619,34 @@ int cmd_merge_tree(int argc,
"--merge-base", "--stdin");
line_termination = '\0';
while (strbuf_getline_lf(&buf, stdin) != EOF) {
struct strbuf **split;
struct string_list split = STRING_LIST_INIT_NODUP;
const char *input_merge_base = NULL;
split = strbuf_split(&buf, ' ');
if (!split[0] || !split[1])
string_list_split_in_place_f(&split, buf.buf, " ", -1,
STRING_LIST_SPLIT_TRIM);
if (split.nr < 2)
die(_("malformed input line: '%s'."), buf.buf);
strbuf_rtrim(split[0]);
strbuf_rtrim(split[1]);
/* parse the merge-base */
if (!strcmp(split[1]->buf, "--")) {
input_merge_base = split[0]->buf;
if (!strcmp(split.items[1].string, "--")) {
input_merge_base = split.items[0].string;
}
if (input_merge_base && split[2] && split[3] && !split[4]) {
strbuf_rtrim(split[2]);
strbuf_rtrim(split[3]);
real_merge(&o, input_merge_base, split[2]->buf, split[3]->buf, prefix);
} else if (!input_merge_base && !split[2]) {
real_merge(&o, NULL, split[0]->buf, split[1]->buf, prefix);
if (input_merge_base && split.nr == 4) {
real_merge(&o, input_merge_base,
split.items[2].string, split.items[3].string,
prefix);
} else if (!input_merge_base && split.nr == 2) {
real_merge(&o, NULL,
split.items[0].string, split.items[1].string,
prefix);
} else {
die(_("malformed input line: '%s'."), buf.buf);
}
maybe_flush_or_die(stdout, "stdout");
strbuf_list_free(split);
string_list_clear(&split, 0);
}
strbuf_release(&buf);