undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

receive-pack.c: move iterating over all commands outside execute_commands

Browse Source 
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>
This commit is contained in:
Stefan Beller 2015-01-07 19:23:17 -08:00 committed by Junio C Hamano
parent b6a4788586
commit a1a261457c
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
builtin/receive-pack.c
View File

@ -1064,6 +1064,18 @@ static void warn_if_skipped_connectivity_check(struct command *commands,
die("BUG: connectivity check skipped???"); 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, static void execute_commands(struct command *commands,
const char *unpacker_error, const char *unpacker_error,
struct shallow_info *si) struct shallow_info *si)
@ -1098,12 +1110,7 @@ static void execute_commands(struct command *commands,
free(head_name_to_free); free(head_name_to_free);
head_name = head_name_to_free = resolve_refdup("HEAD", 0, sha1, NULL); head_name = head_name_to_free = resolve_refdup("HEAD", 0, sha1, NULL);
for (cmd = commands; cmd; cmd = cmd->next) { execute_commands_non_atomic(commands, si);
if (!should_process_cmd(cmd))
continue;
cmd->error_string = update(cmd, si);
}
if (shallow_update) if (shallow_update)
warn_if_skipped_connectivity_check(commands, si); warn_if_skipped_connectivity_check(commands, si);