diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-07-14 11:19:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-07-14 11:19:26 -0700 |
| commit | 69ea767bc34a128faf098c978c5ce7389d70feb6 (patch) | |
| tree | 92e310d4501c8bf0d2acff31556bbd61a6014d7e /t | |
| parent | Merge branch 'kn/clang-format-updates' (diff) | |
| parent | read-cache: report lock error when refreshing index (diff) | |
| download | git-69ea767bc34a128faf098c978c5ce7389d70feb6.tar.gz git-69ea767bc34a128faf098c978c5ce7389d70feb6.zip | |
Merge branch 'hy/read-cache-lock-error-fix'
A failure to open the index file for writing due to conflicting
access did not state what went wrong, which has been corrected.
* hy/read-cache-lock-error-fix:
read-cache: report lock error when refreshing index
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3903-stash.sh | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index c58ccb136c..0bb4648e36 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -1672,11 +1672,9 @@ test_expect_success 'stash create reports a locked index' ' echo change >A.file && touch .git/index.lock && - cat >expect <<-EOF && - error: could not write index - EOF test_must_fail git stash create 2>err && - test_cmp expect err + test_grep "error: could not write index" err && + test_grep "error: Unable to create '.*index.lock'" err ) ' @@ -1689,11 +1687,9 @@ test_expect_success 'stash push reports a locked index' ' echo change >A.file && touch .git/index.lock && - cat >expect <<-EOF && - error: could not write index - EOF test_must_fail git stash push 2>err && - test_cmp expect err + test_grep "error: could not write index" err && + test_grep "error: Unable to create '.*index.lock'" err ) ' @@ -1707,11 +1703,9 @@ test_expect_success 'stash apply reports a locked index' ' git stash push && touch .git/index.lock && - cat >expect <<-EOF && - error: could not write index - EOF test_must_fail git stash apply 2>err && - test_cmp expect err + test_grep "error: could not write index" err && + test_grep "error: Unable to create '.*index.lock'" err ) ' |