diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-02-21 15:14:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-21 15:14:41 -0800 |
| commit | e147e9693ace9f7c6dafd4095d3cde80d047e787 (patch) | |
| tree | 64c5bf2ec4982c34a353c0fa1b70993d8fc54b12 /builtin | |
| parent | Merge branch 'cb/transfer-no-progress' into maint (diff) | |
| parent | do not override receive-pack errors (diff) | |
| download | tgif-e147e9693ace9f7c6dafd4095d3cde80d047e787.tar.xz | |
Merge branch 'cb/receive-pack-keep-errors' into maint
* cb/receive-pack-keep-errors:
do not override receive-pack errors
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/receive-pack.c | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index fa7448be5a..0afb8b2896 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -642,8 +642,10 @@ static void check_aliased_updates(struct command *commands) } sort_string_list(&ref_list); - for (cmd = commands; cmd; cmd = cmd->next) - check_aliased_update(cmd, &ref_list); + for (cmd = commands; cmd; cmd = cmd->next) { + if (!cmd->error_string) + check_aliased_update(cmd, &ref_list); + } string_list_clear(&ref_list, 0); } @@ -707,8 +709,10 @@ static void execute_commands(struct command *commands, const char *unpacker_erro set_connectivity_errors(commands); if (run_receive_hook(commands, pre_receive_hook, 0)) { - for (cmd = commands; cmd; cmd = cmd->next) - cmd->error_string = "pre-receive hook declined"; + for (cmd = commands; cmd; cmd = cmd->next) { + if (!cmd->error_string) + cmd->error_string = "pre-receive hook declined"; + } return; } @@ -717,9 +721,15 @@ static void execute_commands(struct command *commands, const char *unpacker_erro free(head_name_to_free); head_name = head_name_to_free = resolve_refdup("HEAD", sha1, 0, NULL); - for (cmd = commands; cmd; cmd = cmd->next) - if (!cmd->skip_update) - cmd->error_string = update(cmd); + for (cmd = commands; cmd; cmd = cmd->next) { + if (cmd->error_string) + continue; + + if (cmd->skip_update) + continue; + + cmd->error_string = update(cmd); + } } static struct command *read_head_info(void) |