diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2021-10-16 09:07:09 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-10-18 09:24:51 -0700 |
| commit | 5e311edfd3717373912df8239daba6903d78b7bd (patch) | |
| tree | 71c7060ea7b1465db766c4226bdf3d9da30e049d | |
| parent | sparse index: fix use-after-free bug in cache_tree_verify() (diff) | |
| download | tgif-5e311edfd3717373912df8239daba6903d78b7bd.tar.xz | |
t1092: run "rebase --apply" without "-q" in testing
We run a few operations and make sure they produce identical results
with and without sparse-index; the version we merged to the "next"
branch used the "-q" option to work around a breakage caused by a
version used at Microsoft with some unreleased changes, but since
we would want to make sure the commands produce identical results,
including reports given to the output that lists which commits were
picked, use of "-q" loses too much interesting information.
Let's drop "-q" from the command invocation and revisit the issue
when the problematic changes are upstreamed.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Helped-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t1092-sparse-checkout-compatibility.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh index 80c77bb432..85d5279b33 100755 --- a/t/t1092-sparse-checkout-compatibility.sh +++ b/t/t1092-sparse-checkout-compatibility.sh @@ -484,7 +484,7 @@ test_expect_success 'checkout and reset (mixed) [sparse]' ' test_expect_success 'merge, cherry-pick, and rebase' ' init_repos && - for OPERATION in "merge -m merge" cherry-pick "rebase --apply -q" "rebase --merge" + for OPERATION in "merge -m merge" cherry-pick "rebase --apply" "rebase --merge" do test_all_match git checkout -B temp update-deep && test_all_match git $OPERATION update-folder1 && |