зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
2122f8b963
Коммит
346d437aab
|
@ -214,7 +214,6 @@ static int append_ref(const char *refname, const unsigned char *sha1, int flags,
|
||||||
struct commit *commit;
|
struct commit *commit;
|
||||||
int kind;
|
int kind;
|
||||||
int len;
|
int len;
|
||||||
static struct commit_list branch;
|
|
||||||
|
|
||||||
/* Detect kind */
|
/* Detect kind */
|
||||||
if (!prefixcmp(refname, "refs/heads/")) {
|
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)
|
if ((kind & ref_list->kinds) == 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (merge_filter != NO_FILTER) {
|
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);
|
|
||||||
add_pending_object(&ref_list->revs,
|
add_pending_object(&ref_list->revs,
|
||||||
(struct object *)branch.item, refname);
|
(struct object *)commit, refname);
|
||||||
}
|
|
||||||
|
|
||||||
/* Resize buffer */
|
/* Resize buffer */
|
||||||
if (ref_list->index >= ref_list->alloc) {
|
if (ref_list->index >= ref_list->alloc) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче