summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder.dev@gmail.com>2019-11-12 10:38:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-12-06 21:29:04 (GMT)
commitdd432a6ecf022b40760dd04fe4e94fdfcb1b270d (patch)
tree0c69e0164f8cad94afc38cdcb1e8b75007f88dc2
parentdd090a8a37b4507bf6c79ad93ec076673fa6313c (diff)
downloadgit-dd432a6ecf022b40760dd04fe4e94fdfcb1b270d.zip
git-dd432a6ecf022b40760dd04fe4e94fdfcb1b270d.tar.gz
git-dd432a6ecf022b40760dd04fe4e94fdfcb1b270d.tar.bz2
name-rev: restructure parsing commits and applying date cutoff
At the beginning of the recursive name_rev() function it parses the commit it got as parameter, and returns early if the commit is older than a cutoff limit. Restructure this so the caller parses the commit and checks its date, and doesn't invoke name_rev() if the commit to be passed as parameter is older than the cutoff, i.e. both name_ref() before calling name_rev() and name_rev() itself as it iterates over the parent commits. This makes eliminating the recursion a bit easier to follow, and the condition moved to name_ref() will be moved back to name_rev() after the recursion is eliminated. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/name-rev.c29
1 files changed, 16 insertions, 13 deletions
diff --git a/builtin/name-rev.c b/builtin/name-rev.c
index e112a92..5041227 100644
--- a/builtin/name-rev.c
+++ b/builtin/name-rev.c
@@ -111,11 +111,6 @@ static void name_rev(struct commit *commit,
struct commit_list *parents;
int parent_number = 1;
- parse_commit(commit);
-
- if (commit->date < cutoff)
- return;
-
if (!create_or_update_name(commit, tip_name, taggerdate, generation,
distance, from_tag))
return;
@@ -123,6 +118,12 @@ static void name_rev(struct commit *commit,
for (parents = commit->parents;
parents;
parents = parents->next, parent_number++) {
+ struct commit *parent = parents->item;
+
+ parse_commit(parent);
+ if (parent->date < cutoff)
+ continue;
+
if (parent_number > 1) {
size_t len;
char *new_name;
@@ -135,11 +136,11 @@ static void name_rev(struct commit *commit,
new_name = xstrfmt("%.*s^%d", (int)len, tip_name,
parent_number);
- name_rev(parents->item, new_name, taggerdate, 0,
+ name_rev(parent, new_name, taggerdate, 0,
distance + MERGE_TRAVERSAL_WEIGHT,
from_tag);
} else {
- name_rev(parents->item, tip_name, taggerdate,
+ name_rev(parent, tip_name, taggerdate,
generation + 1, distance + 1,
from_tag);
}
@@ -273,16 +274,18 @@ static int name_ref(const char *path, const struct object_id *oid, int flags, vo
if (o && o->type == OBJ_COMMIT) {
struct commit *commit = (struct commit *)o;
int from_tag = starts_with(path, "refs/tags/");
- const char *tip_name;
if (taggerdate == TIME_MAX)
taggerdate = commit->date;
path = name_ref_abbrev(path, can_abbreviate_output);
- if (deref)
- tip_name = xstrfmt("%s^0", path);
- else
- tip_name = xstrdup(path);
- name_rev(commit, tip_name, taggerdate, 0, 0, from_tag);
+ if (commit->date >= cutoff) {
+ const char *tip_name;
+ if (deref)
+ tip_name = xstrfmt("%s^0", path);
+ else
+ tip_name = xstrdup(path);
+ name_rev(commit, tip_name, taggerdate, 0, 0, from_tag);
+ }
}
return 0;
}