diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-10-12 16:30:49 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-10-12 11:16:59 -0700 |
| commit | 4ef91a2d795c424eda2bec1bfbbd0c813bcc978a (patch) | |
| tree | 964cf0dbd008401d8e9a265da7556608ac14ec6f /t/t0004-unwritable.sh | |
| parent | unwritable tests: assert exact error output (diff) | |
| download | tgif-4ef91a2d795c424eda2bec1bfbbd0c813bcc978a.tar.xz | |
commit: fix duplication regression in permission error output
Fix a regression in the error output emitted when .git/objects can't
be written to. Before 9c4d6c0297b (cache-tree: Write updated
cache-tree after commit, 2014-07-13) we'd emit only one "insufficient
permission" error, now we'll do so again.
The cause is rather straightforward, we've got WRITE_TREE_SILENT for
the use-case of wanting to prepare an index silently, quieting any
permission etc. error output. Then when we attempt to update to
that (possibly broken) index we'll run into the same errors again.
But with 9c4d6c0297b the gap between the cache-tree API and the object
store wasn't closed in terms of asking write_object_file() to be
silent. I.e. post-9c4d6c0297b the first call is to prepare_index(),
and after that we'll call prepare_to_commit(). We only want verbose
error output from the latter.
So let's add and use that facility with a corresponding HASH_SILENT
flag, its only user is cache-tree.c's update_one(), which will set it
if its "WRITE_TREE_SILENT" flag is set.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t0004-unwritable.sh')
| -rwxr-xr-x | t/t0004-unwritable.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t0004-unwritable.sh b/t/t0004-unwritable.sh index d26d18413c..3bdafbae0f 100755 --- a/t/t0004-unwritable.sh +++ b/t/t0004-unwritable.sh @@ -37,7 +37,7 @@ test_expect_success POSIXPERM,SANITY 'commit should notice unwritable repository ' test_lazy_prereq COMMIT_OUT 'test -e "$TRASH_DIRECTORY"/out.commit' -test_expect_failure COMMIT_OUT 'commit output on unwritable repository' ' +test_expect_success COMMIT_OUT 'commit output on unwritable repository' ' cat >expect <<-\EOF && error: insufficient permission for adding an object to repository database .git/objects error: Error building trees |