[PATCHv9 2/9] receive-pack.c: move iterating over all commands outside execute_commands
From: Stefan Beller <hidden>
Date: 2016-06-15 23:03:23
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 <redacted>
---
Notes:
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 68b9cfb..941aae5 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c@@ -1065,6 +1065,18 @@ static void check_shallow_bugs(struct command *commands, "the reported refs above"); } +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)
@@ -1099,12 +1111,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) check_shallow_bugs(commands, si);
--
2.2.1.62.g3f15098