On 01/29, Junio C Hamano wrote:
> * tg/checkout-no-overlay (2019-01-08) 8 commits
> (merged to 'next' on 2019-01-18 at 1e2a79ba5c)
> + checkout: introduce checkout.overlayMode config
> + checkout: introduce --{,no-}overlay option
> + checkout: factor out mark_cache_entry_for_checkout function
> + checkout: clarify comment
> + read-cache: add invalidate parameter to remove_marked_cache_entries
> + entry: support CE_WT_REMOVE flag in checkout_entry
> + entry: factor out unlink_entry function
> + move worktree tests to t24*
>
> "git checkout --no-overlay" can be used to trigger a new mode of
> checking out paths out of the tree-ish, that allows paths that
> match the pathspec that are in the current index and working tree
> and are not in the tree-ish.
>
> Will merge to 'master'.
I was traveling for Git Merge, so I largely ignored the mailing list
for the last week, so I'm a bit late on this, sorry. Jonathan
mentioned in [*1*] that introducing a config option here is a bit
risky, so I think we should revert the last commit in this series.
Patch for doing that below.
There was also some discussion around the naming of the option, but I
don't have a strong opinion on that, so I'm happy with keeping the
--[no-]overlay option. I just wanted to bring it up again here in
case someone had a very strong opinion, and would prefer it being
changed before this goes into 2.21. (Not sure if I'm too late for the
series going to master).
*1*: https://public-inbox.org/git/20190123204721.GB34357@xxxxxxxxxx/
--- >8 ---
Subject: [PATCH] revert "checkout: introduce checkout.overlayMode config"
This reverts 1495ff7da5 ("checkout: introduce checkout.overlayMode
config", 2019-01-08) and thus removes the checkout.overlayMode config
option.
The option was originally introduced to give users the option to make
the new no-overlay behaviour the default. However users may be using
'git checkout' in scripts, even though it is porcelain. Users setting
the option to false may actually end up accidentally breaking scripts.
With the introduction of a new subcommand that will make the behaviour
the default, the config option will not be needed anymore anyway.
Revert the commit and remove the config option, so we don't risk
breaking scripts.
Suggested-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
Signed-off-by: Thomas Gummerer <t.gummerer@xxxxxxxxx>
---
Documentation/config/checkout.txt | 7 -------
builtin/checkout.c | 8 +-------
t/t2025-checkout-no-overlay.sh | 10 ----------
3 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/Documentation/config/checkout.txt b/Documentation/config/checkout.txt
index 73380a8d86..c4118fa196 100644
--- a/Documentation/config/checkout.txt
+++ b/Documentation/config/checkout.txt
@@ -21,10 +21,3 @@ 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
index b5dfc45736..0c5fe948ef 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -1019,19 +1019,13 @@ 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
index a4912e35cb..76330cb5ab 100755
--- a/t/t2025-checkout-no-overlay.sh
+++ b/t/t2025-checkout-no-overlay.sh
@@ -44,14 +44,4 @@ 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
--
2.20.1.495.gaa96b0ce6b
