From 6b9c58f4669b3832ed2830f0cb1a307ea6bc6063 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 15 Apr 2006 23:46:36 -0700 Subject: Split init_revisions() out of setup_revisions() Merging all three option parsers related to whatchanged is unarguably the right thing, but the fallout was too big to scare me away. Let's try it once again, but once step at time. This splits out init_revisions() call from setup_revisions(), so that the callers can set different defaults to match the traditional benaviour. The rev-list command is still broken in a big way, which is the topic of next step. Signed-off-by: Junio C Hamano --- revision.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'revision.c') diff --git a/revision.c b/revision.c index bdf8005aec..9693b6e4c7 100644 --- a/revision.c +++ b/revision.c @@ -475,11 +475,9 @@ static void handle_all(struct rev_info *revs, unsigned flags) void init_revisions(struct rev_info *revs) { - unsigned abbrev = revs->abbrev; - memset(revs, 0, sizeof(*revs)); - revs->abbrev = abbrev; + revs->abbrev = DEFAULT_ABBREV; revs->ignore_merges = 1; revs->pruning.recursive = 1; revs->pruning.add_remove = file_add_remove; @@ -516,8 +514,6 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch const char **unrecognized = argv + 1; int left = 1; - init_revisions(revs); - /* First, search for "--" */ seen_dashdash = 0; for (i = 1; i < argc; i++) { -- cgit v1.2.3 From ba1d45051e050cbcf68ccccacea86a4b6ecde731 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sat, 15 Apr 2006 12:09:56 -0700 Subject: Tentative built-in "git show" This uses the "--no-walk" flag that I never actually implemented (but I'm sure I mentioned it) to make "git show" be essentially the same thing as "git whatchanged --no-walk". It just refuses to add more interesting parents to the revision walking history, so you don't actually get any history, you just get the commit you asked for. I was going to add "--no-walk" as a real argument flag to git-rev-list too, but I'm not sure anybody actually needs it. Although it might be useful for porcelain, so I left the door open. [jc: ported to the unified option structure by Linus] Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano --- revision.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'revision.c') diff --git a/revision.c b/revision.c index 9693b6e4c7..f8fb028855 100644 --- a/revision.c +++ b/revision.c @@ -380,6 +380,9 @@ static void add_parents_to_list(struct rev_info *revs, struct commit *commit, st if (revs->prune_fn) revs->prune_fn(revs, commit); + if (revs->no_walk) + return; + parent = commit->parents; while (parent) { struct commit *p = parent->item; @@ -816,6 +819,8 @@ void prepare_revision_walk(struct rev_info *revs) list = list->next; } + if (revs->no_walk) + return; if (revs->limited) limit_list(revs); if (revs->topo_order) -- cgit v1.2.3