From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Oct 2021 23:06:57 +0000 (-0700)
Subject: Merge branch 'ab/fix-commit-error-message-upon-unwritable-object-store'
X-Git-Tag: v2.34.0-rc0~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c428e4205a50cee19669d5b73cc149ec2254a5d;p=thirdparty%2Fgit.git

Merge branch 'ab/fix-commit-error-message-upon-unwritable-object-store'

"git commit" gave duplicated error message when the object store
was unwritable, which has been corrected.

* ab/fix-commit-error-message-upon-unwritable-object-store:
  commit: fix duplication regression in permission error output
  unwritable tests: assert exact error output
---

2c428e4205a50cee19669d5b73cc149ec2254a5d
diff --cc t/t0004-unwritable.sh
index 37d68ef03b,3bdafbae0f..2e9d652d82
--- a/t/t0004-unwritable.sh
+++ b/t/t0004-unwritable.sh
@@@ -19,13 -18,31 +19,31 @@@ test_expect_success setup 
  test_expect_success POSIXPERM,SANITY 'write-tree should notice unwritable repository' '
  	test_when_finished "chmod 775 .git/objects .git/objects/??" &&
  	chmod a-w .git/objects .git/objects/?? &&
- 	test_must_fail git write-tree
+ 	test_must_fail git write-tree 2>out.write-tree
+ '
+ 
+ test_lazy_prereq WRITE_TREE_OUT 'test -e "$TRASH_DIRECTORY"/out.write-tree'
+ test_expect_success WRITE_TREE_OUT 'write-tree output on unwritable repository' '
+ 	cat >expect <<-\EOF &&
+ 	error: insufficient permission for adding an object to repository database .git/objects
+ 	fatal: git-write-tree: error building trees
+ 	EOF
+ 	test_cmp expect out.write-tree
  '
  
 -test_expect_success POSIXPERM,SANITY 'commit should notice unwritable repository' '
 +test_expect_success POSIXPERM,SANITY,!SANITIZE_LEAK 'commit should notice unwritable repository' '
  	test_when_finished "chmod 775 .git/objects .git/objects/??" &&
  	chmod a-w .git/objects .git/objects/?? &&
- 	test_must_fail git commit -m second
+ 	test_must_fail git commit -m second 2>out.commit
+ '
+ 
+ test_lazy_prereq COMMIT_OUT 'test -e "$TRASH_DIRECTORY"/out.commit'
+ 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
+ 	EOF
+ 	test_cmp expect out.commit
  '
  
  test_expect_success POSIXPERM,SANITY 'update-index should notice unwritable repository' '