Small fixes in Documentation/git-mv.txt

diff --git a/rev-list.c b/rev-list.c
index edf3b378745c7f28d00f974c852d064fd5151f13..e17f928061250c24465e1b96f89a18acb98a748c 100644 (file)
--- a/rev-list.c
+++ b/rev-list.c
@@ -14,21 +14,27 @@
 #define TREECHANGE     (1u << 4)
 
 static const char rev_list_usage[] =
-       "git-rev-list [OPTION] commit-id <commit-id>\n"
-                     "  --max-count=nr\n"
-                     "  --max-age=epoch\n"
-                     "  --min-age=epoch\n"
-                     "  --parents\n"
-                     "  --bisect\n"
-                     "  --objects\n"
-                     "  --unpacked\n"
-                     "  --header\n"
-                     "  --pretty\n"
-                     "  --no-merges\n"
-                     "  --merge-order [ --show-breaks ]\n"
-                     "  --topo-order";
-
-static int dense = 0;
+"git-rev-list [OPTION] <commit-id>... [ -- paths... ]\n"
+"  limiting output:\n"
+"    --max-count=nr\n"
+"    --max-age=epoch\n"
+"    --min-age=epoch\n"
+"    --sparse\n"
+"    --no-merges\n"
+"    --all\n"
+"  ordering output:\n"
+"    --merge-order [ --show-breaks ]\n"
+"    --topo-order\n"
+"  formatting output:\n"
+"    --parents\n"
+"    --objects\n"
+"    --unpacked\n"
+"    --header | --pretty\n"
+"  special purpose:\n"
+"    --bisect"
+;
+
+static int dense = 1;
 static int unpacked = 0;
 static int bisect_list = 0;
 static int tag_objects = 0;
@@ -118,8 +124,6 @@ static int filter_commit(struct commit * commit)
                stop_traversal=1;
                return CONTINUE;
        }
-       if (max_count != -1 && !max_count--)
-               return STOP;
        if (no_merges && (commit->parents && commit->parents->next))
                return CONTINUE;
        if (paths && dense) {
@@ -142,6 +146,9 @@ static int process_commit(struct commit * commit)
                return CONTINUE;
        }
 
+       if (max_count != -1 && !max_count--)
+               return STOP;
+
        show_commit(commit);
 
        return CONTINUE;
@@ -613,13 +620,10 @@ static void add_pending_object(struct object *obj, const char *name)
        add_object(obj, &pending_objects, name);
 }
 
-static struct commit *get_commit_reference(const char *name, unsigned int flags)
+static struct commit *get_commit_reference(const char *name, const unsigned char *sha1, unsigned int flags)
 {
-       unsigned char sha1[20];
        struct object *object;
 
-       if (get_sha1(name, sha1))
-               usage(rev_list_usage);
        object = parse_object(sha1);
        if (!object)
                die("bad object %s", name);
@@ -697,7 +701,7 @@ static struct commit_list **global_lst;
 
 static int include_one_commit(const char *path, const unsigned char *sha1)
 {
-       struct commit *com = get_commit_reference(path, 0);
+       struct commit *com = get_commit_reference(path, sha1, 0);
        handle_one_commit(com, global_lst);
        return 0;
 }
@@ -720,6 +724,7 @@ int main(int argc, const char **argv)
                const char *arg = argv[i];
                char *dotdot;
                struct commit *commit;
+               unsigned char sha1[20];
 
                if (!strncmp(arg, "--max-count=", 12)) {
                        max_count = atoi(arg + 12);
@@ -793,12 +798,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;
                }
 
@@ -808,15 +813,19 @@ int main(int argc, const char **argv)
                flags = 0;
                dotdot = strstr(arg, "..");
                if (dotdot) {
+                       unsigned char from_sha1[20];
                        char *next = dotdot + 2;
-                       struct commit *exclude = NULL;
-                       struct commit *include = NULL;
                        *dotdot = 0;
                        if (!*next)
                                next = "HEAD";
-                       exclude = get_commit_reference(arg, UNINTERESTING);
-                       include = get_commit_reference(next, 0);
-                       if (exclude && include) {
+                       if (!get_sha1(arg, from_sha1) && !get_sha1(next, sha1)) {
+                               struct commit *exclude;
+                               struct commit *include;
+                               
+                               exclude = get_commit_reference(arg, from_sha1, UNINTERESTING);
+                               include = get_commit_reference(next, sha1, 0);
+                               if (!exclude || !include)
+                                       die("Invalid revision range %s..%s", arg, next);
                                limited = 1;
                                handle_one_commit(exclude, &list);
                                handle_one_commit(include, &list);
@@ -829,10 +838,21 @@ int main(int argc, const char **argv)
                        arg++;
                        limited = 1;
                }
-               commit = get_commit_reference(arg, flags);
+               if (get_sha1(arg, sha1) < 0)
+                       break;
+               commit = get_commit_reference(arg, sha1, flags);
                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;