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 <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
return cmd_log_wc(argc, argv, envp, &rev);
}
return cmd_log_wc(argc, argv, envp, &rev);
}
+static int cmd_show(int argc, const char **argv, char **envp)
+{
+ struct rev_info rev;
+
+ init_revisions(&rev);
+ rev.diff = 1;
+ rev.ignore_merges = 0;
+ rev.combine_merges = 1;
+ rev.dense_combined_merges = 1;
+ rev.abbrev = DEFAULT_ABBREV;
+ rev.commit_format = CMIT_FMT_DEFAULT;
+ rev.diffopt.recursive = 1;
+ rev.no_walk = 1;
+ argc = setup_revisions(argc, argv, &rev, "HEAD");
+ return cmd_log_wc(argc, argv, envp, &rev);
+}
+
static int cmd_log(int argc, const char **argv, char **envp)
{
struct rev_info rev;
static int cmd_log(int argc, const char **argv, char **envp)
{
struct rev_info rev;
{ "help", cmd_help },
{ "log", cmd_log },
{ "whatchanged", cmd_wc },
{ "help", cmd_help },
{ "log", cmd_log },
{ "whatchanged", cmd_wc },
if (revs->prune_fn)
revs->prune_fn(revs, commit);
if (revs->prune_fn)
revs->prune_fn(revs, commit);
+ if (revs->no_walk)
+ return;
+
parent = commit->parents;
while (parent) {
struct commit *p = parent->item;
parent = commit->parents;
while (parent) {
struct commit *p = parent->item;
+ if (revs->no_walk)
+ return;
if (revs->limited)
limit_list(revs);
if (revs->topo_order)
if (revs->limited)
limit_list(revs);
if (revs->topo_order)
/* Traversal flags */
unsigned int dense:1,
no_merges:1,
/* Traversal flags */
unsigned int dense:1,
no_merges:1,
remove_empty_trees:1,
lifo:1,
topo_order:1,
remove_empty_trees:1,
lifo:1,
topo_order:1,