summaryrefslogtreecommitdiff
path: root/rev-list.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2005-10-25 22:24:55 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-10-26 23:49:38 (GMT)
commit7b34c2fae0d2875b35ad1cc0e416b9c2b9b02b1f (patch)
treec148c898d13e9ff6eedd3b2968a0fe37052efab4 /rev-list.c
parentbd321bcc51e95f644ac5335abe673afcbcaade62 (diff)
downloadgit-7b34c2fae0d2875b35ad1cc0e416b9c2b9b02b1f.zip
git-7b34c2fae0d2875b35ad1cc0e416b9c2b9b02b1f.tar.gz
git-7b34c2fae0d2875b35ad1cc0e416b9c2b9b02b1f.tar.bz2
git-rev-list: make --dense the default (and introduce "--sparse")
This actually does three things: - make "--dense" the default for git-rev-list. Since dense is a no-op if no filenames are given, this doesn't actually change any historical behaviour, but it's logically the right default (if we want to prune on filenames, do it fully. The sparse "merge-only" thing may be useful, but it's not what you'd normally expect) - make "git-rev-parse" show the default revision control before it shows any pathnames. This was a real bug, but nobody would ever have noticed, because the default thing tends to only make sense for git-rev-list, and git-rev-list didn't use to take pathnames. - it changes "git-rev-list" to match the other commands that take a mix of revisions and filenames - it no longer requires the "--" before filenames (although you still need to do it if a filename could be confused with a revision name, eg "gitk" in the git archive) This all just makes for much more pleasant and obvous usage. Just doing a gitk t/ does the obvious thing: it will show the history as it concerns the "t/" subdirectory. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'rev-list.c')
-rw-r--r--rev-list.c25
1 files changed, 18 insertions, 7 deletions
diff --git a/rev-list.c b/rev-list.c
index edf3b37..ac7a47f 100644
--- a/rev-list.c
+++ b/rev-list.c
@@ -28,7 +28,7 @@ static const char rev_list_usage[] =
" --merge-order [ --show-breaks ]\n"
" --topo-order";
-static int dense = 0;
+static int dense = 1;
static int unpacked = 0;
static int bisect_list = 0;
static int tag_objects = 0;
@@ -619,7 +619,7 @@ static struct commit *get_commit_reference(const char *name, unsigned int flags)
struct object *object;
if (get_sha1(name, sha1))
- usage(rev_list_usage);
+ return NULL;
object = parse_object(sha1);
if (!object)
die("bad object %s", name);
@@ -793,12 +793,12 @@ int main(int argc, const char **argv)
dense = 1;
continue;
}
+ if (!strcmp(arg, "--sparse")) {
+ dense = 0;
+ continue;
+ }
if (!strcmp(arg, "--")) {
- paths = get_pathspec(prefix, argv + i + 1);
- if (paths) {
- limited = 1;
- diff_tree_setup_paths(paths);
- }
+ i++;
break;
}
@@ -830,9 +830,20 @@ int main(int argc, const char **argv)
limited = 1;
}
commit = get_commit_reference(arg, flags);
+ if (!commit)
+ break;
handle_one_commit(commit, &list);
}
+ if (!list)
+ usage(rev_list_usage);
+
+ paths = get_pathspec(prefix, argv + i);
+ if (paths) {
+ limited = 1;
+ diff_tree_setup_paths(paths);
+ }
+
save_commit_buffer = verbose_header;
track_object_refs = 0;