Skip to content

Commit

Permalink
builtin-branch: remove duplicated code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Lars Hjemli authored and Junio C Hamano committed Jul 27, 2008
1 parent 2122f8b commit 346d437
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions builtin-branch.c
Original file line number Diff line number Diff line change
Expand Up @@ -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/")) {
Expand All @@ -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) {
Expand Down

0 comments on commit 346d437

Please sign in to comment.