summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2017-12-25 18:47:51 +0100
committerJunio C Hamano <gitster@pobox.com>2017-12-28 13:50:05 -0800
commitf1230fb5fc77a47fd7964bb3724db352aea4a476 (patch)
treea3acbf739fb3eb931b2c43b86429d99caf296e6f
parenta9a03fa0d7292758b1c5038c0acb9466c9ac36da (diff)
downloadgit-f1230fb5fc77a47fd7964bb3724db352aea4a476.tar.gz
revision: remove the unused flag leak_pending
Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--revision.c3
-rw-r--r--revision.h12
2 files changed, 1 insertions, 14 deletions
diff --git a/revision.c b/revision.c
index d167223e69..8b14142bb1 100644
--- a/revision.c
+++ b/revision.c
@@ -2850,8 +2850,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,