mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

load_subtree(): remove unnecessary conditional

Browse Source 
At this point in the code, len is *always* <= 20.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty
2017-08-26 10:28:02 +02:00
committed by Junio C Hamano
parent 65eb8e0ca7
commit d3b0c6bebf
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
notes.c
View File

@ -446,25 +446,24 @@ static void load_subtree(struct notes_tree *t, struct leaf_node *subtree,
* If object SHA1 is incomplete (len < 20), and current * If object SHA1 is incomplete (len < 20), and current
* component consists of 2 hex chars, assume note subtree * component consists of 2 hex chars, assume note subtree
*/ */
if (len <= GIT_SHA1_RAWSZ) { type = PTR_TYPE_NOTE;
type = PTR_TYPE_NOTE; l = (struct leaf_node *)
l = (struct leaf_node *) xcalloc(1, sizeof(struct leaf_node));
xcalloc(1, sizeof(struct leaf_node)); oidcpy(&l->key_oid, &object_oid);
oidcpy(&l->key_oid, &object_oid); oidcpy(&l->val_oid, entry.oid);
oidcpy(&l->val_oid, entry.oid); if (len < GIT_SHA1_RAWSZ) {
if (len < GIT_SHA1_RAWSZ) { if (!S_ISDIR(entry.mode) || path_len != 2)
if (!S_ISDIR(entry.mode) || path_len != 2) goto handle_non_note; /* not subtree */
goto handle_non_note; /* not subtree */ l->key_oid.hash[KEY_INDEX] = (unsigned char) len;
l->key_oid.hash[KEY_INDEX] = (unsigned char) len; type = PTR_TYPE_SUBTREE;
type = PTR_TYPE_SUBTREE;
}
if (note_tree_insert(t, node, n, l, type,
combine_notes_concatenate))
die("Failed to load %s %s into notes tree "
"from %s",
type == PTR_TYPE_NOTE ? "note" : "subtree",
oid_to_hex(&l->key_oid), t->ref);
} }
if (note_tree_insert(t, node, n, l, type,
combine_notes_concatenate))
die("Failed to load %s %s into notes tree "
"from %s",
type == PTR_TYPE_NOTE ? "note" : "subtree",
oid_to_hex(&l->key_oid), t->ref);
continue; continue;
handle_non_note: handle_non_note: