From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Apr 2024 20:21:33 +0000 (-0700)
Subject: Merge branch 'pw/checkout-conflict-errorfix'
X-Git-Tag: v2.45.0-rc0~68
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ccdc7d98bb39aad1dc1bc78357a763d10fe14ddb;p=thirdparty%2Fgit.git

Merge branch 'pw/checkout-conflict-errorfix'

"git checkout --conflict=bad" reported a bad conflictStyle as if it
were given to a configuration variable; it has been corrected to
report that the command line option is bad.

* pw/checkout-conflict-errorfix:
  checkout: fix interaction between --conflict and --merge
  checkout: cleanup --conflict=<style> parsing
  merge options: add a conflict style member
  merge-ll: introduce LL_MERGE_OPTIONS_INIT
  xdiff-interface: refactor parsing of merge.conflictstyle
---

ccdc7d98bb39aad1dc1bc78357a763d10fe14ddb
diff --cc builtin/checkout.c
index 2e8b0d18f4,30d13c9e14..2b6166c284
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@@ -1930,8 -1924,9 +1949,7 @@@ int cmd_checkout(int argc, const char *
  		OPT_BOOL(0, "overlay", &opts.overlay_mode, N_("use overlay mode (default)")),
  		OPT_END()
  	};
 -	int ret;
 -	struct branch_info new_branch_info = { 0 };
  
- 	memset(&opts, 0, sizeof(opts));
  	opts.dwim_new_local_branch = 1;
  	opts.switch_branch_doing_nothing_is_ok = 1;
  	opts.only_merge_on_switching_branches = 0;
@@@ -1978,8 -1978,9 +1996,7 @@@ int cmd_switch(int argc, const char **a
  			 N_("throw away local modifications")),
  		OPT_END()
  	};
 -	int ret;
 -	struct branch_info new_branch_info = { 0 };
  
- 	memset(&opts, 0, sizeof(opts));
  	opts.dwim_new_local_branch = 1;
  	opts.accept_ref = 1;
  	opts.accept_pathspec = 0;
@@@ -2016,8 -2020,9 +2033,7 @@@ int cmd_restore(int argc, const char **
  		OPT_BOOL(0, "overlay", &opts.overlay_mode, N_("use overlay mode")),
  		OPT_END()
  	};
 -	int ret;
 -	struct branch_info new_branch_info = { 0 };
  
- 	memset(&opts, 0, sizeof(opts));
  	opts.accept_ref = 0;
  	opts.accept_pathspec = 1;
  	opts.empty_pathspec_ok = 0;