diff options
| -rw-r--r-- | rev-list.c | 25 | ||||
| -rw-r--r-- | rev-parse.c | 2 |
2 files changed, 19 insertions, 8 deletions
diff --git a/rev-list.c b/rev-list.c index edf3b3787..ac7a47fdc 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; diff --git a/rev-parse.c b/rev-parse.c index 243f89f3c..adfc68c9b 100644 --- a/rev-parse.c +++ b/rev-parse.c @@ -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); |