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

builtin-branch: remove duplicated code

Browse Source 
The previous optimization to --[no-]merged ended up with some duplicated
code which this patch removes.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Lars Hjemli 2008-07-26 12:27:23 +02:00 committed by Junio C Hamano
parent 2122f8b963
commit 346d437aab
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builtin-branch.c
View File

@ -214,7 +214,6 @@ static int append_ref(const char *refname, const unsigned char *sha1, int flags,
struct commit *commit;
int kind;
int len;
static struct commit_list branch;
/* Detect kind */
if (!prefixcmp(refname, "refs/heads/")) {
@ -238,13 +237,9 @@ static int append_ref(const char *refname, const unsigned char *sha1, int flags,
if ((kind & ref_list->kinds) == 0)
return 0;
if (merge_filter != NO_FILTER) {
branch.item = lookup_commit_reference_gently(sha1, 1);
if (!branch.item)
die("Unable to lookup tip of branch %s", refname);
if (merge_filter != NO_FILTER)
add_pending_object(&ref_list->revs,
(struct object *)branch.item, refname);
}
(struct object *)commit, refname);
/* Resize buffer */
if (ref_list->index >= ref_list->alloc) {