mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
receive-pack: do not expect object 0{40} to exist
When pushing to delete a ref, it uses 0{40} as an object name to signal that the request is a deletion. We shouldn't trigger "deletion of a corrupt ref" warning in such a case, which was designed to notice that a ref points at an object that is truly missing from the repository. Reported-by: Stefan Näwe Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
db85b3a74f
commit
ee6dfb2d83
|
@ -634,7 +634,7 @@ static int command_singleton_iterator(void *cb_data, unsigned char sha1[20])
|
||||||
struct command **cmd_list = cb_data;
|
struct command **cmd_list = cb_data;
|
||||||
struct command *cmd = *cmd_list;
|
struct command *cmd = *cmd_list;
|
||||||
|
|
||||||
if (!cmd)
|
if (!cmd || is_null_sha1(cmd->new_sha1))
|
||||||
return -1; /* end of list */
|
return -1; /* end of list */
|
||||||
*cmd_list = NULL; /* this returns only one */
|
*cmd_list = NULL; /* this returns only one */
|
||||||
hashcpy(sha1, cmd->new_sha1);
|
hashcpy(sha1, cmd->new_sha1);
|
||||||
|
@ -659,11 +659,16 @@ static int iterate_receive_command_list(void *cb_data, unsigned char sha1[20])
|
||||||
struct command **cmd_list = cb_data;
|
struct command **cmd_list = cb_data;
|
||||||
struct command *cmd = *cmd_list;
|
struct command *cmd = *cmd_list;
|
||||||
|
|
||||||
if (!cmd)
|
while (cmd) {
|
||||||
return -1; /* end of list */
|
if (!is_null_sha1(cmd->new_sha1)) {
|
||||||
*cmd_list = cmd->next;
|
|
||||||
hashcpy(sha1, cmd->new_sha1);
|
hashcpy(sha1, cmd->new_sha1);
|
||||||
|
*cmd_list = cmd->next;
|
||||||
return 0;
|
return 0;
|
||||||
|
}
|
||||||
|
cmd = cmd->next;
|
||||||
|
}
|
||||||
|
*cmd_list = NULL;
|
||||||
|
return -1; /* end of list */
|
||||||
}
|
}
|
||||||
|
|
||||||
static void execute_commands(struct command *commands, const char *unpacker_error)
|
static void execute_commands(struct command *commands, const char *unpacker_error)
|
||||||
|
|
Loading…
Reference in a new issue