checkout: introduce checkout.overlayMode config

tgummerer · gitster · commit 1495ff7da526 · 2019-01-08T14:49:28.000-08:00
In the previous patch we introduced a new no-overlay mode for git
checkout.  Some users (such as the author of this commit) may want to
have this mode turned on by default as it matches their mental model
more closely.  Make that possible by introducing a new config option
to that extend.

Signed-off-by: Thomas Gummerer &lt;t.gummerer@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/Documentation/config/checkout.txt b/Documentation/config/checkout.txt
@@ -21,3 +21,10 @@ checkout.optimizeNewBranch::
 	will not update the skip-worktree bit in the index nor add/remove
 	files in the working directory to reflect the current sparse checkout
 	settings nor will it show the local changes.
+
+checkout.overlayMode::
+	In the default overlay mode, `git checkout` never
+	removes files from the index or the working tree.  When
+	setting `checkout.overlayMode` to false, files that appear in
+	the index and working tree, but not in <tree-ish> are removed,
+	to make them match <tree-ish> exactly.
diff --git a/builtin/checkout.c b/builtin/checkout.c
@@ -1019,13 +1019,19 @@ static int switch_branches(const struct checkout_opts *opts,
 
 static int git_checkout_config(const char *var, const char *value, void *cb)
 {
+	struct checkout_opts *opts = cb;
+
 	if (!strcmp(var, "checkout.optimizenewbranch")) {
 		checkout_optimize_new_branch = git_config_bool(var, value);
 		return 0;
 	}
 
+	if (!strcmp(var, "checkout.overlaymode")) {
+		opts->overlay_mode = git_config_bool(var, value);
+		return 0;
+	}
+
 	if (!strcmp(var, "diff.ignoresubmodules")) {
-		struct checkout_opts *opts = cb;
 		handle_ignore_submodules_arg(&opts->diff_options, value);
 		return 0;
 	}
diff --git a/t/t2025-checkout-no-overlay.sh b/t/t2025-checkout-no-overlay.sh
@@ -44,4 +44,14 @@ test_expect_success '--no-overlay --theirs with D/F conflict deletes file' '
 	test_path_is_missing file1
 '
 
+test_expect_success 'checkout with checkout.overlayMode=false deletes files not in <tree-ish>' '
+	>file &&
+	mkdir dir &&
+	>dir/file1 &&
+	git add file dir/file1 &&
+	git -c checkout.overlayMode=false checkout HEAD -- file &&
+	test_path_is_missing file &&
+	test_path_is_file dir/file1
+'
+
 test_done

Original file line number	Diff line number	Diff line change
`@@ -1019,13 +1019,19 @@ static int switch_branches(const struct checkout_opts *opts,`
`1019`	`1019`
`1020`	`1020`	`static int git_checkout_config(const char var, const char value, void *cb)`
`1021`	`1021`	`{`
	`1022`	`+ struct checkout_opts *opts = cb;`
	`1023`	`+`
`1022`	`1024`	`if (!strcmp(var, "checkout.optimizenewbranch")) {`
`1023`	`1025`	`checkout_optimize_new_branch = git_config_bool(var, value);`
`1024`	`1026`	`return 0;`
`1025`	`1027`	`}`
`1026`	`1028`
	`1029`	`+ if (!strcmp(var, "checkout.overlaymode")) {`
	`1030`	`+ opts->overlay_mode = git_config_bool(var, value);`
	`1031`	`+ return 0;`
	`1032`	`+ }`
	`1033`	`+`
`1027`	`1034`	`if (!strcmp(var, "diff.ignoresubmodules")) {`
`1028`		`- struct checkout_opts *opts = cb;`
`1029`	`1035`	`handle_ignore_submodules_arg(&opts->diff_options, value);`
`1030`	`1036`	`return 0;`
`1031`	`1037`	`}`