Skip to content

Commit

Permalink
receive-pack.c: move iterating over all commands outside execute_comm…
Browse files Browse the repository at this point in the history
…ands

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 <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Stefan Beller authored and Junio C Hamano committed Jan 8, 2015
1 parent b6a4788 commit a1a2614
Showing 1 changed file with 13 additions and 6 deletions.
19 changes: 13 additions & 6 deletions builtin/receive-pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit a1a2614

Please sign in to comment.