diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-02-23 22:27:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-02-23 22:27:03 -0800 |
| commit | 816c02ce8ecddce065e83db9f4ecb78f6b0e23dc (patch) | |
| tree | b85fa8225e982f67dd4e9d516b92c3f03a1f99bc /receive-pack.c | |
| parent | 1d3d03bbeaaf55844868affc96231930aae792e6 (diff) | |
| parent | 7bd1527d2d8c80a6e9a0f8583082a5aee5428c68 (diff) | |
| download | git-816c02ce8ecddce065e83db9f4ecb78f6b0e23dc.tar.gz | |
Merge fixes early for next maint series.
Diffstat (limited to 'receive-pack.c')
| -rw-r--r-- | receive-pack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/receive-pack.c b/receive-pack.c index eae31e370d..2a3db16d68 100644 --- a/receive-pack.c +++ b/receive-pack.c @@ -92,7 +92,7 @@ static int run_update_hook(const char *refname, case -ERR_RUN_COMMAND_WAITPID_WRONG_PID: return error("waitpid is confused"); case -ERR_RUN_COMMAND_WAITPID_SIGNAL: - return error("%s died of signal\n", update_hook); + return error("%s died of signal", update_hook); case -ERR_RUN_COMMAND_WAITPID_NOEXIT: return error("%s died strangely", update_hook); default: @@ -158,7 +158,7 @@ static int update(struct command *cmd) if (run_update_hook(name, old_hex, new_hex)) { unlink(lock_name); cmd->error_string = "hook declined"; - return error("hook declined to update %s\n", name); + return error("hook declined to update %s", name); } else if (rename(lock_name, name) < 0) { unlink(lock_name); |