summaryrefslogtreecommitdiff
path: root/builtin-branch.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2008-07-26 12:27:23 +0200
committerJunio C Hamano <gitster@pobox.com>2008-07-27 14:14:01 -0700
commit346d437aab2496872f477bb759db10a43b5dfb5e (patch)
treed11a233d3e484eea67c6613ef4e0aaa1b554142e /builtin-branch.c
parent2122f8b963d49a59762e121c2da571c2348dcce3 (diff)
downloadgit-346d437aab2496872f477bb759db10a43b5dfb5e.tar.gz
builtin-branch: remove duplicated code
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>
Diffstat (limited to 'builtin-branch.c')
-rw-r--r--builtin-branch.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/builtin-branch.c b/builtin-branch.c
index 5db8ad836a..675a9b1637 100644
--- a/builtin-branch.c
+++ b/builtin-branch.c
@@ -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) {