sequencer: break some long lines
reformat save_opts() to remove excessively long lines. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Phillip Wood committed
Mar 13, 2019 at 18:26 UTC
f59199d5faac328becafdb60507ca4c05bdd9a95
1 file changed
+22
-13
sequencer.c
+22
-13
@@ -2701,36 +2701,45 @@ static int save_opts(struct replay_opts *opts)
2701
int res = 0;
2702
2703
if (opts->no_commit)
2704
- res |= git_config_set_in_file_gently(opts_file, "options.no-commit", "true");
2704
+ res |= git_config_set_in_file_gently(opts_file,
2705
+ "options.no-commit", "true");
2706
if (opts->edit)
2706
- res |= git_config_set_in_file_gently(opts_file, "options.edit", "true");
2707
+ res |= git_config_set_in_file_gently(opts_file,
2708
+ "options.edit", "true");
2709
if (opts->signoff)
2708
- res |= git_config_set_in_file_gently(opts_file, "options.signoff", "true");
2710
+ res |= git_config_set_in_file_gently(opts_file,
2711
+ "options.signoff", "true");
2712
if (opts->record_origin)
2710
- res |= git_config_set_in_file_gently(opts_file, "options.record-origin", "true");
2713
+ res |= git_config_set_in_file_gently(opts_file,
2714
+ "options.record-origin", "true");
2715
if (opts->allow_ff)
2712
- res |= git_config_set_in_file_gently(opts_file, "options.allow-ff", "true");
2716
+ res |= git_config_set_in_file_gently(opts_file,
2717
+ "options.allow-ff", "true");
2718
if (opts->mainline) {
2719
struct strbuf buf = STRBUF_INIT;
2720
strbuf_addf(&buf, "%d", opts->mainline);
2716
- res |= git_config_set_in_file_gently(opts_file, "options.mainline", buf.buf);
2721
+ res |= git_config_set_in_file_gently(opts_file,
2722
+ "options.mainline", buf.buf);
2723
strbuf_release(&buf);
2724
}
2725
if (opts->strategy)
2720
- res |= git_config_set_in_file_gently(opts_file, "options.strategy", opts->strategy);
2726
+ res |= git_config_set_in_file_gently(opts_file,
2727
+ "options.strategy", opts->strategy);
2728
if (opts->gpg_sign)
2722
- res |= git_config_set_in_file_gently(opts_file, "options.gpg-sign", opts->gpg_sign);
2729
+ res |= git_config_set_in_file_gently(opts_file,
2730
+ "options.gpg-sign", opts->gpg_sign);
2731
if (opts->xopts) {
2732
int i;
2733
for (i = 0; i < opts->xopts_nr; i++)
2734
res |= git_config_set_multivar_in_file_gently(opts_file,
2727
- "options.strategy-option",
2728
- opts->xopts[i], "^$", 0);
2735
+ "options.strategy-option",
2736
+ opts->xopts[i], "^$", 0);
2737
}
2738
if (opts->allow_rerere_auto)
2731
- res |= git_config_set_in_file_gently(opts_file, "options.allow-rerere-auto",
2732
- opts->allow_rerere_auto == RERERE_AUTOUPDATE ?
2733
- "true" : "false");
2739
+ res |= git_config_set_in_file_gently(opts_file,
2740
+ "options.allow-rerere-auto",
2741
+ opts->allow_rerere_auto == RERERE_AUTOUPDATE ?
2742
+ "true" : "false");
2743
return res;
2744
}
2745