From: "René Scharfe" <l.s.r@web.de>
To: Git List <git@vger.kernel.org>
Cc: "Jeff King" <peff@peff.net>,
"Martin Ågren" <martin.agren@gmail.com>,
"Christian Couder" <christian.couder@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>
Subject: [PATCH v2 8/9] revision: remove the unused flag leak_pending
Date: Mon, 25 Dec 2017 18:47:51 +0100 [thread overview]
Message-ID: <369e1e1b-2889-13f1-d9b0-5f0bf72a3d5e@web.de> (raw)
In-Reply-To: <ac4c77a1-6403-ca20-2021-50c99201915a@web.de>
Signed-off-by: Rene Scharfe <l.s.r@web.de>
---
revision.c | 3 +--
revision.h | 12 ------------
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/revision.c b/revision.c
index f6a3da5cd9..7239315de9 100644
--- a/revision.c
+++ b/revision.c
@@ -2860,8 +2860,7 @@ int prepare_revision_walk(struct rev_info *revs)
}
}
}
- if (!revs->leak_pending)
- object_array_clear(&old_pending);
+ object_array_clear(&old_pending);
/* Signal whether we need per-parent treesame decoration */
if (revs->simplify_merges ||
diff --git a/revision.h b/revision.h
index 54761200ad..27be70e75c 100644
--- a/revision.h
+++ b/revision.h
@@ -150,18 +150,6 @@ struct rev_info {
date_mode_explicit:1,
preserve_subject:1;
unsigned int disable_stdin:1;
- /*
- * Set `leak_pending` to prevent `prepare_revision_walk()` from clearing
- * the array of pending objects (`pending`). It will still forget about
- * the array and its entries, so they really are leaked. This can be
- * useful if the `struct object_array` `pending` is copied before
- * calling `prepare_revision_walk()`. By setting `leak_pending`, you
- * effectively claim ownership of the old array, so you should most
- * likely call `object_array_clear(&pending_copy)` once you are done.
- * Observe that this is about ownership of the array and its entries,
- * not the commits referenced by those entries.
- */
- unsigned int leak_pending:1;
/* --show-linear-break */
unsigned int track_linear:1,
track_first_time:1,
--
2.15.1
next prev parent reply other threads:[~2017-12-25 17:48 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-16 12:12 [PATCH] revision: introduce prepare_revision_walk_extended() René Scharfe
2017-12-17 10:20 ` Martin Ågren
2017-12-18 15:10 ` Jeff King
2017-12-18 19:18 ` René Scharfe
2017-12-19 11:49 ` Jeff King
2017-12-19 18:33 ` Junio C Hamano
2017-12-20 13:08 ` Jeff King
2017-12-21 18:41 ` René Scharfe
2017-12-24 14:22 ` Jeff King
2017-12-25 17:36 ` René Scharfe
2017-12-25 17:41 ` [PATCH v2 0/9] revision: get rid of the flag leak_pending René Scharfe
2017-12-25 17:43 ` [PATCH v2 1/9] commit: avoid allocation in clear_commit_marks_many() René Scharfe
2018-01-10 7:54 ` Jeff King
2017-12-25 17:44 ` [PATCH v2 2/9] commit: use clear_commit_marks_many() in remove_redundant() René Scharfe
2017-12-25 17:44 ` [PATCH v2 3/9] ref-filter: use clear_commit_marks_many() in do_merge_filter() René Scharfe
2017-12-25 17:44 ` [PATCH v2 4/9] object: add clear_commit_marks_all() René Scharfe
2018-01-10 7:58 ` Jeff King
2018-01-11 18:57 ` René Scharfe
2018-01-12 15:20 ` Jeff King
2017-12-25 17:45 ` [PATCH v2 5/9] bisect: avoid using the rev_info flag leak_pending René Scharfe
2018-01-10 8:07 ` Jeff King
2018-01-11 18:57 ` René Scharfe
2018-01-12 15:23 ` Jeff King
2017-12-25 17:46 ` [PATCH v2 6/9] bundle: " René Scharfe
2017-12-28 21:13 ` Junio C Hamano
2018-01-10 8:18 ` Jeff King
2017-12-25 17:47 ` [PATCH v2 7/9] checkout: " René Scharfe
2017-12-28 21:24 ` Junio C Hamano
2017-12-25 17:47 ` René Scharfe [this message]
2017-12-25 17:48 ` [PATCH v2 9/9] commit: remove unused function clear_commit_marks_for_object_array() René Scharfe
2017-12-28 20:32 ` [PATCH v2 0/9] revision: get rid of the flag leak_pending Junio C Hamano
2018-01-10 8:20 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=369e1e1b-2889-13f1-d9b0-5f0bf72a3d5e@web.de \
--to=l.s.r@web.de \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=martin.agren@gmail.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).