Skip to content

Commit 4b7d295

Browse files
committed
Merge branch '1174-remove-any-and-as-ts-wrapup' of https://github.com/jescalada/git-proxy into 1174-remove-any-and-as-ts-wrapup
2 parents 833543e + c37cbab commit 4b7d295

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/proxy/chain.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export const executeChain = async (req: Request, _res: Response): Promise<Action
6969
}
7070
}
7171
} catch (error: unknown) {
72-
const msg = handleAndLogError(error, 'An error occurred when executing the chain');
72+
const msg = handleAndLogError(error, 'An unexpected error occurred when executing the chain');
7373
action.error = true;
7474
action.errorMessage = msg;
7575
} finally {

src/proxy/processors/push-action/preReceive.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ const exec = async (
9090
return action;
9191
} catch (error: unknown) {
9292
const msg = getErrorMessage(error);
93-
const stdErrSuffix = stderrTrimmed ? `\n${stderrTrimmed}` : '';
93+
const stdErrSuffix = stderrTrimmed ? `\nHook stderr: ${stderrTrimmed}` : '';
9494
step.error = true;
9595
step.log('Push failed, pre-receive hook returned an error.');
9696
step.setError(`Hook execution error: ${msg}${stdErrSuffix}`);

0 commit comments

Comments
 (0)