2019-04-25 09:45:55 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='restore basic functionality'
|
|
|
|
|
2020-11-18 23:44:22 +00:00
|
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
tests: mark tests relying on the current default for `init.defaultBranch`
In addition to the manual adjustment to let the `linux-gcc` CI job run
the test suite with `master` and then with `main`, this patch makes sure
that GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME is set in all test scripts
that currently rely on the initial branch name being `master by default.
To determine which test scripts to mark up, the first step was to
force-set the default branch name to `master` in
- all test scripts that contain the keyword `master`,
- t4211, which expects `t/t4211/history.export` with a hard-coded ref to
initialize the default branch,
- t5560 because it sources `t/t556x_common` which uses `master`,
- t8002 and t8012 because both source `t/annotate-tests.sh` which also
uses `master`)
This trick was performed by this command:
$ sed -i '/^ *\. \.\/\(test-lib\|lib-\(bash\|cvs\|git-svn\)\|gitweb-lib\)\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' $(git grep -l master t/t[0-9]*.sh) \
t/t4211*.sh t/t5560*.sh t/t8002*.sh t/t8012*.sh
After that, careful, manual inspection revealed that some of the test
scripts containing the needle `master` do not actually rely on a
specific default branch name: either they mention `master` only in a
comment, or they initialize that branch specificially, or they do not
actually refer to the current default branch. Therefore, the
aforementioned modification was undone in those test scripts thusly:
$ git checkout HEAD -- \
t/t0027-auto-crlf.sh t/t0060-path-utils.sh \
t/t1011-read-tree-sparse-checkout.sh \
t/t1305-config-include.sh t/t1309-early-config.sh \
t/t1402-check-ref-format.sh t/t1450-fsck.sh \
t/t2024-checkout-dwim.sh \
t/t2106-update-index-assume-unchanged.sh \
t/t3040-subprojects-basic.sh t/t3301-notes.sh \
t/t3308-notes-merge.sh t/t3423-rebase-reword.sh \
t/t3436-rebase-more-options.sh \
t/t4015-diff-whitespace.sh t/t4257-am-interactive.sh \
t/t5323-pack-redundant.sh t/t5401-update-hooks.sh \
t/t5511-refspec.sh t/t5526-fetch-submodules.sh \
t/t5529-push-errors.sh t/t5530-upload-pack-error.sh \
t/t5548-push-porcelain.sh \
t/t5552-skipping-fetch-negotiator.sh \
t/t5572-pull-submodule.sh t/t5608-clone-2gb.sh \
t/t5614-clone-submodules-shallow.sh \
t/t7508-status.sh t/t7606-merge-custom.sh \
t/t9302-fast-import-unpack-limit.sh
We excluded one set of test scripts in these commands, though: the range
of `git p4` tests. The reason? `git p4` stores the (foreign) remote
branch in the branch called `p4/master`, which is obviously not the
default branch. Manual analysis revealed that only five of these tests
actually require a specific default branch name to pass; They were
modified thusly:
$ sed -i '/^ *\. \.\/lib-git-p4\.sh$/i\
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master\
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\
' t/t980[0167]*.sh t/t9811*.sh
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-11-18 23:44:19 +00:00
|
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
|
2019-04-25 09:45:55 +00:00
|
|
|
. ./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 &&
|
2020-11-18 23:44:22 +00:00
|
|
|
git update-ref refs/heads/one main
|
2019-04-25 09:45:55 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2020-05-05 07:17:16 +00:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2019-04-25 09:45:55 +00:00
|
|
|
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 &&
|
2020-11-18 23:44:22 +00:00
|
|
|
git switch -c second main &&
|
2019-04-25 09:45:55 +00:00
|
|
|
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 &&
|
2019-06-20 09:55:20 +00:00
|
|
|
test_must_be_empty output &&
|
|
|
|
test_must_be_empty diff-output
|
2019-04-25 09:45:55 +00:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2019-08-01 16:09:10 +00:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
restore: invalidate cache-tree when removing entries with --staged
When "git restore --staged <path>" removes a path that's in the index,
it marks the entry with CE_REMOVE, but we don't do anything to
invalidate the cache-tree. In the non-staged case, we end up in
checkout_worktree(), which calls remove_marked_cache_entries(). That
actually drops the entries from the index, as well as invalidating the
cache-tree and untracked-cache.
But with --staged, we never call checkout_worktree(), and the CE_REMOVE
entries remain. Interestingly, they are dropped when we write out the
index, but that means the resulting index is inconsistent: its
cache-tree will not match the actual entries, and running "git commit"
immediately after will create the wrong tree.
We can solve this by calling remove_marked_cache_entries() ourselves
before writing out the index. Note that we can't just hoist it out of
checkout_worktree(); that function needs to iterate over the CE_REMOVE
entries (to drop their matching worktree files) before removing them.
One curiosity about the test: without this patch, it actually triggers a
BUG() when running git-restore:
BUG: cache-tree.c:810: new1 with flags 0x4420000 should not be in cache-tree
But in the original problem report, which used a similar recipe,
git-restore actually creates the bogus index (and the commit is created
with the wrong tree). I'm not sure why the test here behaves differently
than my out-of-suite reproduction, but what's here should catch either
symptom (and the fix corrects both cases).
Reported-by: Torsten Krah <krah.tm@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2020-01-08 11:43:44 +00:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2023-07-31 22:44:08 +00:00
|
|
|
test_expect_success 'restore --merge to unresolve' '
|
|
|
|
O=$(echo original | git hash-object -w --stdin) &&
|
|
|
|
A=$(echo ourside | git hash-object -w --stdin) &&
|
|
|
|
B=$(echo theirside | git hash-object -w --stdin) &&
|
|
|
|
{
|
|
|
|
echo "100644 $O 1 file" &&
|
|
|
|
echo "100644 $A 2 file" &&
|
|
|
|
echo "100644 $B 3 file"
|
|
|
|
} | git update-index --index-info &&
|
|
|
|
echo nothing >file &&
|
|
|
|
git restore --worktree --merge file &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
<<<<<<< ours
|
|
|
|
ourside
|
|
|
|
=======
|
|
|
|
theirside
|
|
|
|
>>>>>>> theirs
|
|
|
|
EOF
|
|
|
|
test_cmp expect file
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'restore --merge to unresolve after (mistaken) resolution' '
|
|
|
|
O=$(echo original | git hash-object -w --stdin) &&
|
|
|
|
A=$(echo ourside | git hash-object -w --stdin) &&
|
|
|
|
B=$(echo theirside | git hash-object -w --stdin) &&
|
|
|
|
{
|
|
|
|
echo "100644 $O 1 file" &&
|
|
|
|
echo "100644 $A 2 file" &&
|
|
|
|
echo "100644 $B 3 file"
|
|
|
|
} | git update-index --index-info &&
|
|
|
|
echo nothing >file &&
|
|
|
|
git add file &&
|
|
|
|
git restore --worktree --merge file &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
<<<<<<< ours
|
|
|
|
ourside
|
|
|
|
=======
|
|
|
|
theirside
|
|
|
|
>>>>>>> theirs
|
|
|
|
EOF
|
|
|
|
test_cmp expect file
|
|
|
|
'
|
|
|
|
|
2023-07-31 22:44:09 +00:00
|
|
|
test_expect_success 'restore --merge to unresolve after (mistaken) resolution' '
|
2023-07-31 22:44:08 +00:00
|
|
|
O=$(echo original | git hash-object -w --stdin) &&
|
|
|
|
A=$(echo ourside | git hash-object -w --stdin) &&
|
|
|
|
B=$(echo theirside | git hash-object -w --stdin) &&
|
|
|
|
{
|
|
|
|
echo "100644 $O 1 file" &&
|
|
|
|
echo "100644 $A 2 file" &&
|
|
|
|
echo "100644 $B 3 file"
|
|
|
|
} | git update-index --index-info &&
|
|
|
|
git rm -f file &&
|
|
|
|
git restore --worktree --merge file &&
|
|
|
|
cat >expect <<-\EOF &&
|
|
|
|
<<<<<<< ours
|
|
|
|
ourside
|
|
|
|
=======
|
|
|
|
theirside
|
|
|
|
>>>>>>> theirs
|
|
|
|
EOF
|
|
|
|
test_cmp expect file
|
|
|
|
'
|
|
|
|
|
2023-07-31 22:44:07 +00:00
|
|
|
test_expect_success 'restore with merge options are incompatible with certain options' '
|
2023-02-26 18:43:54 +00:00
|
|
|
for opts in \
|
|
|
|
"--staged --ours" \
|
|
|
|
"--staged --theirs" \
|
|
|
|
"--staged --merge" \
|
2023-07-31 22:44:07 +00:00
|
|
|
"--source=HEAD --ours" \
|
|
|
|
"--source=HEAD --theirs" \
|
|
|
|
"--source=HEAD --merge" \
|
2023-02-26 18:43:54 +00:00
|
|
|
"--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 &&
|
2023-07-31 22:44:07 +00:00
|
|
|
grep "cannot be used" err || return
|
2023-02-26 18:43:54 +00:00
|
|
|
done
|
|
|
|
'
|
|
|
|
|
2019-04-25 09:45:55 +00:00
|
|
|
test_done
|