mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-09 07:56:11 +02:00
Code

Merge efe15545f7 into e326e52010

This commit is contained in:
Eisuke Kawashima 2024-04-25 23:27:04 +00:00 committed by GitHub
parent e326e52010 efe15545f7
commit fb8993d767
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compat/simple-ipc/ipc-win32.c
View File

@ -574,7 +574,7 @@ static void *server_thread_proc(void *_server_thread_data)
case CR_CONNECT_PENDING:
/* By construction, this should not happen. */
BUG("ipc-server[%s]: unexpeced CR_CONNECT_PENDING",
BUG("ipc-server[%s]: unexpected CR_CONNECT_PENDING",
server_thread_data->server_data->buf_path.buf);
case CR_CONNECT_ERROR:

2
git-p4.py
View File

@ -1804,7 +1804,7 @@ def __init__(self):
status from the script will abort the process.
The purpose of the hook is to edit the message file in place, and it is not
supressed by the `--no-verify` option. This hook is called even if
suppressed by the `--no-verify` option. This hook is called even if
`--prepare-p4-only` is set.
The `p4-changelist` hook is executed after the changelist message has been