From: Stefan Beller Date: Thu, 08 Jan 2015 03:23:17 GMT Subject: [PATCHv12 03/10] receive-pack.c: move iterating over all commands outside execute_commands Message-ID: <1420687404-13997-4-git-send-email-sbeller@google.com> In-Reply-To: <1420687404-13997-1-git-send-email-sbeller@google.com> This commit allows us in a later patch to easily distinguish between the non atomic way to update the received refs and the atomic way which is introduced in a later patch. Signed-off-by: Stefan Beller --- Notes: v10, v11, v12: no changes v9: new and shiny. But makes the next patch easier to review. builtin/receive-pack.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 3bdb158..0ccfb3d 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -1064,6 +1064,18 @@ static void warn_if_skipped_connectivity_check(struct command *commands, die("BUG: connectivity check skipped???"); } +static void execute_commands_non_atomic(struct command *commands, + struct shallow_info *si) +{ + struct command *cmd; + for (cmd = commands; cmd; cmd = cmd->next) { + if (!should_process_cmd(cmd)) + continue; + + cmd->error_string = update(cmd, si); + } +} + static void execute_commands(struct command *commands, const char *unpacker_error, struct shallow_info *si) @@ -1098,12 +1110,7 @@ static void execute_commands(struct command *commands, free(head_name_to_free); head_name = head_name_to_free = resolve_refdup("HEAD", 0, sha1, NULL); - for (cmd = commands; cmd; cmd = cmd->next) { - if (!should_process_cmd(cmd)) - continue; - - cmd->error_string = update(cmd, si); - } + execute_commands_non_atomic(commands, si); if (shallow_update) warn_if_skipped_connectivity_check(commands, si); -- 2.2.1.62.g3f15098