development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-02 14:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

git-rev-list: make --dense the default (and introduce "--sparse")

Browse source 
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>
This commit is contained in:
Linus Torvalds 2005-10-25 15:24:55 -07:00 committed by Junio C Hamano
parent bd321bcc51
commit 7b34c2fae0
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
rev-list.c
View file

@ -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;

2
rev-parse.c
View file

@ -153,6 +153,7 @@ static void show_datestring(const char *flag, const char *datestr)
static void show_file(const char *arg)
{
show_default();
if ((filter & (DO_NONFLAGS|DO_NOREV)) == (DO_NONFLAGS|DO_NOREV))
show(arg);
}
@ -174,7 +175,6 @@ int main(int argc, char **argv)
if (*arg == '-') {
if (!strcmp(arg, "--")) {
as_is = 1;
show_default();
/* Pass on the "--" if we show anything but files.. */
if (filter & (DO_FLAGS | DO_REVS))
show_file(arg);