development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-17 02:57:48 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch 'ak/restore-both-incompatible-with-conflicts'

Browse source 
"git restore" supports options like "--ours" that are only
meaningful during a conflicted merge, but these options are only
meaningful when updating the working tree files.  These options are
marked to be incompatible when both "--staged" and "--worktree" are
in effect.

* ak/restore-both-incompatible-with-conflicts:
  restore: fault --staged --worktree with merge opts
This commit is contained in:
Junio C Hamano 2023-03-19 15:03:10 -07:00
parent b0d2440442 ee8a88826a
commit 67076b85b8
2 changed files with 37 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
builtin/checkout.c
View file

@ -490,15 +490,28 @@ static int checkout_paths(const struct checkout_opts *opts,
die(_("'%s' must be used when '%s' is not specified"),
"--worktree", "--source");
if (opts->checkout_index && !opts->checkout_worktree &&
opts->writeout_stage)
die(_("'%s' or '%s' cannot be used with %s"),
"--ours", "--theirs", "--staged");
/*
* Reject --staged option to the restore command when combined with
* merge-related options. Use the accept_ref flag to distinguish it
* from the checkout command, which does not accept --staged anyway.
*
* `restore --ours|--theirs --worktree --staged` could mean resolving
* conflicted paths to one side in both the worktree and the index,
* but does not currently.
*
* `restore --merge|--conflict=<style>` already recreates conflicts
* in both the worktree and the index, so adding --staged would be
* meaningless.
*/
if (!opts->accept_ref && opts->checkout_index) {
if (opts->writeout_stage)
die(_("'%s' or '%s' cannot be used with %s"),
"--ours", "--theirs", "--staged");
if (opts->checkout_index && !opts->checkout_worktree &&
opts->merge)
die(_("'%s' or '%s' cannot be used with %s"),
"--merge", "--conflict", "--staged");
if (opts->merge)
die(_("'%s' or '%s' cannot be used with %s"),
"--merge", "--conflict", "--staged");
}
if (opts->patch_mode) {
enum add_p_mode patch_mode;

16
t/t2070-restore.sh
View file

@ -137,4 +137,20 @@ test_expect_success 'restore --staged invalidates cache tree for deletions' '
test_must_fail git rev-parse HEAD:new1
'
test_expect_success 'restore with merge options rejects --staged' '
for opts in \
"--staged --ours" \
"--staged --theirs" \
"--staged --merge" \
"--staged --conflict=diff3" \
"--staged --worktree --ours" \
"--staged --worktree --theirs" \
"--staged --worktree --merge" \
"--staged --worktree --conflict=zdiff3"
do
test_must_fail git restore $opts . 2>err &&
grep "cannot be used with --staged" err || return
done
'
test_done