mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
ee8a88826a
The 'restore' command already rejects the --merge, --conflict, --ours and --theirs options when combined with --staged, but accepts them when --worktree is added as well. Unfortunately that doesn't appear to do anything useful. The --ours and --theirs options seem to be ignored when both --staged and --worktree are given, whereas with --merge or --conflict, the command has the same effect as if the --staged option wasn't present. So reject those options with '--staged --worktree' as well, using opts->accept_ref to distinguish restore from checkout. Add test for both '--staged' and '--staged --worktree'. Signed-off-by: Andy Koppe <andy.koppe@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
156 lines
4.2 KiB
Bash
Executable file
156 lines
4.2 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='restore basic functionality'
|
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
test_commit first &&
|
|
echo first-and-a-half >>first.t &&
|
|
git add first.t &&
|
|
test_commit second &&
|
|
echo one >one &&
|
|
echo two >two &&
|
|
echo untracked >untracked &&
|
|
echo ignored >ignored &&
|
|
echo /ignored >.gitignore &&
|
|
git add one two .gitignore &&
|
|
git update-ref refs/heads/one main
|
|
'
|
|
|
|
test_expect_success 'restore without pathspec is not ok' '
|
|
test_must_fail git restore &&
|
|
test_must_fail git restore --source=first
|
|
'
|
|
|
|
test_expect_success 'restore a file, ignoring branch of same name' '
|
|
cat one >expected &&
|
|
echo dirty >>one &&
|
|
git restore one &&
|
|
test_cmp expected one
|
|
'
|
|
|
|
test_expect_success 'restore a file on worktree from another ref' '
|
|
test_when_finished git reset --hard &&
|
|
git cat-file blob first:./first.t >expected &&
|
|
git restore --source=first first.t &&
|
|
test_cmp expected first.t &&
|
|
git cat-file blob HEAD:./first.t >expected &&
|
|
git show :first.t >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'restore a file in the index from another ref' '
|
|
test_when_finished git reset --hard &&
|
|
git cat-file blob first:./first.t >expected &&
|
|
git restore --source=first --staged first.t &&
|
|
git show :first.t >actual &&
|
|
test_cmp expected actual &&
|
|
git cat-file blob HEAD:./first.t >expected &&
|
|
test_cmp expected first.t
|
|
'
|
|
|
|
test_expect_success 'restore a file in both the index and worktree from another ref' '
|
|
test_when_finished git reset --hard &&
|
|
git cat-file blob first:./first.t >expected &&
|
|
git restore --source=first --staged --worktree first.t &&
|
|
git show :first.t >actual &&
|
|
test_cmp expected actual &&
|
|
test_cmp expected first.t
|
|
'
|
|
|
|
test_expect_success 'restore --staged uses HEAD as source' '
|
|
test_when_finished git reset --hard &&
|
|
git cat-file blob :./first.t >expected &&
|
|
echo index-dirty >>first.t &&
|
|
git add first.t &&
|
|
git restore --staged first.t &&
|
|
git cat-file blob :./first.t >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'restore --worktree --staged uses HEAD as source' '
|
|
test_when_finished git reset --hard &&
|
|
git show HEAD:./first.t >expected &&
|
|
echo dirty >>first.t &&
|
|
git add first.t &&
|
|
git restore --worktree --staged first.t &&
|
|
git show :./first.t >actual &&
|
|
test_cmp expected actual &&
|
|
test_cmp expected first.t
|
|
'
|
|
|
|
test_expect_success 'restore --ignore-unmerged ignores unmerged entries' '
|
|
git init unmerged &&
|
|
(
|
|
cd unmerged &&
|
|
echo one >unmerged &&
|
|
echo one >common &&
|
|
git add unmerged common &&
|
|
git commit -m common &&
|
|
git switch -c first &&
|
|
echo first >unmerged &&
|
|
git commit -am first &&
|
|
git switch -c second main &&
|
|
echo second >unmerged &&
|
|
git commit -am second &&
|
|
test_must_fail git merge first &&
|
|
|
|
echo dirty >>common &&
|
|
test_must_fail git restore . &&
|
|
|
|
git restore --ignore-unmerged --quiet . >output 2>&1 &&
|
|
git diff common >diff-output &&
|
|
test_must_be_empty output &&
|
|
test_must_be_empty diff-output
|
|
)
|
|
'
|
|
|
|
test_expect_success 'restore --staged adds deleted intent-to-add file back to index' '
|
|
echo "nonempty" >nonempty &&
|
|
>empty &&
|
|
git add nonempty empty &&
|
|
git commit -m "create files to be deleted" &&
|
|
git rm --cached nonempty empty &&
|
|
git add -N nonempty empty &&
|
|
git restore --staged nonempty empty &&
|
|
git diff --cached --exit-code
|
|
'
|
|
|
|
test_expect_success 'restore --staged invalidates cache tree for deletions' '
|
|
test_when_finished git reset --hard &&
|
|
>new1 &&
|
|
>new2 &&
|
|
git add new1 new2 &&
|
|
|
|
# It is important to commit and then reset here, so that the index
|
|
# contains a valid cache-tree for the "both" tree.
|
|
git commit -m both &&
|
|
git reset --soft HEAD^ &&
|
|
|
|
git restore --staged new1 &&
|
|
git commit -m "just new2" &&
|
|
git rev-parse HEAD:new2 &&
|
|
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
|