summaryrefslogtreecommitdiff
path: root/revision.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2007-11-05 13:22:34 -0800
committerJunio C Hamano <gitster@pobox.com>2007-11-05 18:19:28 -0800
commit53b2c823f6e862e0c83a4a25bab43e8c32e9c289 (patch)
treefef43cbdbaccd2ff8e7e7795de5722846bf03bd0 /revision.h
parent252a7c02354a3e2825cfde3c5053a04acc07be9c (diff)
downloadgit-53b2c823f6e862e0c83a4a25bab43e8c32e9c289.tar.gz
revision walker: mini clean-up
This removes the unnecessary indirection of "revs->prune_fn", since that function is always the same one (or NULL), and there is in fact not even an abstraction reason to make it a function (i.e. its not called from some other file and doesn't allow us to keep the function itself static or anything like that). It then just replaces it with a bit that says "prune or not", and if not pruning, every commit gets TREECHANGE. That in turn means that - if (!revs->prune_fn || (flags & TREECHANGE)) - if (revs->prune_fn && !(flags & TREECHANGE)) just become - if (flags & TREECHANGE) - if (!(flags & TREECHANGE)) respectively. Together with adding the "single_parent()" helper function, the "complex" conditional now becomes if (!(flags & TREECHANGE) && rev->dense && single_parent(commit)) continue; Also indirection of "revs->dense" checking is thrown away the same way, because TREECHANGE bit is set appropriately now. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.h')
-rw-r--r--revision.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/revision.h b/revision.h
index 2232247be4..a79851449c 100644
--- a/revision.h
+++ b/revision.h
@@ -15,8 +15,6 @@
struct rev_info;
struct log_info;
-typedef void (prune_fn_t)(struct rev_info *revs, struct commit *commit);
-
struct rev_info {
/* Starting list */
struct commit_list *commits;
@@ -28,12 +26,11 @@ struct rev_info {
/* Basic information */
const char *prefix;
void *prune_data;
- prune_fn_t *prune_fn;
-
unsigned int early_output;
/* Traversal flags */
unsigned int dense:1,
+ prune:1,
no_merges:1,
no_walk:1,
remove_empty_trees:1,