fixup! rebase: allow overriding the maximal length of the generated l…

…abels D'oh, I forgot to initialize `max_label_length`... 🤦 Signed-off-by: Johannes Schindelin <[email protected]>
dscho · Aug 10, 2023 · d4e8fa6 · d4e8fa6
1 parent 1ef7cba
commit d4e8fa6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/sequencer.c b/sequencer.c
@@ -5504,7 +5504,8 @@ static int make_script_with_merges(struct pretty_print_context *pp,
 	struct string_entry *entry;
 	struct oidset interesting = OIDSET_INIT, child_seen = OIDSET_INIT,
 		shown = OIDSET_INIT;
-	struct label_state state = { OIDMAP_INIT, { NULL }, STRBUF_INIT };
+	struct label_state state =
+		{ OIDMAP_INIT, { NULL }, STRBUF_INIT, GIT_MAX_LABEL_LENGTH };
 
 	int abbr = flags & TODO_LIST_ABBREVIATE_CMDS;
 	const char *cmd_pick = abbr ? "p" : "pick",

diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh
@@ -85,7 +85,7 @@ test_expect_success 'create completely different structure' '
 	EOF
 	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
 	test_tick &&
-	git rebase -i -r A main &&
+debug	git rebase -i -r A main &&
 	test_cmp_graph <<-\EOF
 	*   Merge the topic branch '\''onebranch'\''
 	|\