mirror of
https://github.com/git/git
synced 2024-11-05 18:59:29 +00:00
e015d4d961
Introduce tests for a variety of `git update-index` use cases, including performance scenarios. Tests are intended to exercise `update-index` with options that change the commands interaction with the index (e.g., `--again`) and with files/directories inside and outside a sparse checkout cone. Of note is that these tests clearly establish the behavior of `git update-index --add` with untracked, outside-of-cone files. Unlike `git add`, which fails with an error when provided with such files, `update-index` succeeds in adding them to the index. Additionally, the `skip-worktree` flag is *not* automatically added to the new entry. Although this is pre-existing behavior, there are a couple of reasons to avoid changing it in favor of consistency with e.g. `git add`: * `update-index` is low-level command for modifying the index; while it can perform operations similar to those of `add`, it traditionally has fewer "guardrails" preventing a user from doing something they may not want to do (in this case, adding an outside-of-cone, non-`skip-worktree` file to the index) * `update-index` typically only exits with an error code if it is incapable of performing an operation (e.g., if an internal function call fails); adding a new file outside the sparse checkout definition is still a valid operation, albeit an inadvisable one * `update-index` does not implicitly set flags (e.g., `skip-worktree`) when creating new index entries with `--add`; if flags need to be updated, options like `--[no-]skip-worktree` allow a user to intentionally set them All this to say that, while there are valid reasons to consider changing the treatment of outside-of-cone files in `update-index`, there are also sufficient reasons for leaving it as-is. Co-authored-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Victoria Dye <vdye@github.com> Reviewed-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
123 lines
3.1 KiB
Bash
Executable file
123 lines
3.1 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description="test performance of Git operations using the index"
|
|
|
|
. ./perf-lib.sh
|
|
|
|
test_perf_default_repo
|
|
|
|
SPARSE_CONE=f2/f4
|
|
|
|
test_expect_success 'setup repo and indexes' '
|
|
git reset --hard HEAD &&
|
|
|
|
# Remove submodules from the example repo, because our
|
|
# duplication of the entire repo creates an unlikely data shape.
|
|
if git config --file .gitmodules --get-regexp "submodule.*.path" >modules
|
|
then
|
|
git rm $(awk "{print \$2}" modules) &&
|
|
git commit -m "remove submodules" || return 1
|
|
fi &&
|
|
|
|
echo bogus >a &&
|
|
cp a b &&
|
|
git add a b &&
|
|
git commit -m "level 0" &&
|
|
BLOB=$(git rev-parse HEAD:a) &&
|
|
OLD_COMMIT=$(git rev-parse HEAD) &&
|
|
OLD_TREE=$(git rev-parse HEAD^{tree}) &&
|
|
|
|
for i in $(test_seq 1 3)
|
|
do
|
|
cat >in <<-EOF &&
|
|
100755 blob $BLOB a
|
|
040000 tree $OLD_TREE f1
|
|
040000 tree $OLD_TREE f2
|
|
040000 tree $OLD_TREE f3
|
|
040000 tree $OLD_TREE f4
|
|
EOF
|
|
NEW_TREE=$(git mktree <in) &&
|
|
NEW_COMMIT=$(git commit-tree $NEW_TREE -p $OLD_COMMIT -m "level $i") &&
|
|
OLD_TREE=$NEW_TREE &&
|
|
OLD_COMMIT=$NEW_COMMIT || return 1
|
|
done &&
|
|
|
|
git sparse-checkout init --cone &&
|
|
git sparse-checkout set $SPARSE_CONE &&
|
|
git checkout -b wide $OLD_COMMIT &&
|
|
|
|
for l2 in f1 f2 f3 f4
|
|
do
|
|
echo more bogus >>$SPARSE_CONE/$l2/a &&
|
|
git commit -a -m "edit $SPARSE_CONE/$l2/a" || return 1
|
|
done &&
|
|
|
|
git -c core.sparseCheckoutCone=true clone --branch=wide --sparse . full-v3 &&
|
|
(
|
|
cd full-v3 &&
|
|
git sparse-checkout init --cone &&
|
|
git sparse-checkout set $SPARSE_CONE &&
|
|
git config index.version 3 &&
|
|
git update-index --index-version=3 &&
|
|
git checkout HEAD~4
|
|
) &&
|
|
git -c core.sparseCheckoutCone=true clone --branch=wide --sparse . full-v4 &&
|
|
(
|
|
cd full-v4 &&
|
|
git sparse-checkout init --cone &&
|
|
git sparse-checkout set $SPARSE_CONE &&
|
|
git config index.version 4 &&
|
|
git update-index --index-version=4 &&
|
|
git checkout HEAD~4
|
|
) &&
|
|
git -c core.sparseCheckoutCone=true clone --branch=wide --sparse . sparse-v3 &&
|
|
(
|
|
cd sparse-v3 &&
|
|
git sparse-checkout init --cone --sparse-index &&
|
|
git sparse-checkout set $SPARSE_CONE &&
|
|
git config index.version 3 &&
|
|
git update-index --index-version=3 &&
|
|
git checkout HEAD~4
|
|
) &&
|
|
git -c core.sparseCheckoutCone=true clone --branch=wide --sparse . sparse-v4 &&
|
|
(
|
|
cd sparse-v4 &&
|
|
git sparse-checkout init --cone --sparse-index &&
|
|
git sparse-checkout set $SPARSE_CONE &&
|
|
git config index.version 4 &&
|
|
git update-index --index-version=4 &&
|
|
git checkout HEAD~4
|
|
)
|
|
'
|
|
|
|
test_perf_on_all () {
|
|
command="$@"
|
|
for repo in full-v3 full-v4 \
|
|
sparse-v3 sparse-v4
|
|
do
|
|
test_perf "$command ($repo)" "
|
|
(
|
|
cd $repo &&
|
|
echo >>$SPARSE_CONE/a &&
|
|
$command
|
|
)
|
|
"
|
|
done
|
|
}
|
|
|
|
test_perf_on_all git status
|
|
test_perf_on_all git add -A
|
|
test_perf_on_all git add .
|
|
test_perf_on_all git commit -a -m A
|
|
test_perf_on_all git checkout -f -
|
|
test_perf_on_all git reset
|
|
test_perf_on_all git reset --hard
|
|
test_perf_on_all git reset -- does-not-exist
|
|
test_perf_on_all git diff
|
|
test_perf_on_all git diff --cached
|
|
test_perf_on_all git blame $SPARSE_CONE/a
|
|
test_perf_on_all git blame $SPARSE_CONE/f3/a
|
|
test_perf_on_all git checkout-index -f --all
|
|
test_perf_on_all git update-index --add --remove $SPARSE_CONE/a
|
|
|
|
test_done
|