rev-list: handle flags for --indexed-objects

When a traversal sees the --indexed-objects option, it adds
all blobs and valid cache-trees from the index to the
traversal using add_index_objects_to_pending(). But that
function totally ignores its flags parameter!

That means that doing:

git rev-list --objects --indexed-objects

and

git rev-list --objects --not --indexed-objects

produce the same output, because we ignore the UNINTERESTING
flag when walking the index in the second example.

Nobody noticed because this feature was added as a way for
tools like repack to increase their coverage of reachable
objects, meaning it would only be used like the first
example above.

But since it's user facing (and because the documentation
describes it "as if the objects are listed on the command
line"), we should make sure the negative case behaves
sensibly.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/revision.c b/revision.c
index a1ddb9e11cbe3a52bb8d3eee3785524db4055854..8e56c9641f8f8f9223249df05212415c5a37a6a5 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -1321,13 +1321,14 @@ void add_reflogs_to_pending(struct rev_info *revs, unsigned flags)
 }
 
 static void add_cache_tree(struct cache_tree *it, struct rev_info *revs,
 }
 
 static void add_cache_tree(struct cache_tree *it, struct rev_info *revs,

-                          struct strbuf *path)
+                          struct strbuf *path, unsigned int flags)

 {
        size_t baselen = path->len;
        int i;
 
        if (it->entry_count >= 0) {
                struct tree *tree = lookup_tree(revs->repo, &it->oid);
 {
        size_t baselen = path->len;
        int i;
 
        if (it->entry_count >= 0) {
                struct tree *tree = lookup_tree(revs->repo, &it->oid);

+               tree->object.flags |= flags;

                add_pending_object_with_path(revs, &tree->object, "",
                                             040000, path->buf);
        }
                add_pending_object_with_path(revs, &tree->object, "",
                                             040000, path->buf);
        }


@@ -1335,14 +1336,15 @@ static void add_cache_tree(struct cache_tree *it, struct rev_info *revs,
        for (i = 0; i < it->subtree_nr; i++) {
                struct cache_tree_sub *sub = it->down[i];
                strbuf_addf(path, "%s%s", baselen ? "/" : "", sub->name);
        for (i = 0; i < it->subtree_nr; i++) {
                struct cache_tree_sub *sub = it->down[i];
                strbuf_addf(path, "%s%s", baselen ? "/" : "", sub->name);

-               add_cache_tree(sub->cache_tree, revs, path);
+               add_cache_tree(sub->cache_tree, revs, path, flags);

                strbuf_setlen(path, baselen);
        }
 
 }
 
 static void do_add_index_objects_to_pending(struct rev_info *revs,
                strbuf_setlen(path, baselen);
        }
 
 }
 
 static void do_add_index_objects_to_pending(struct rev_info *revs,

-                                           struct index_state *istate)
+                                           struct index_state *istate,
+                                           unsigned int flags)

 {
        int i;
 
 {
        int i;
 


@@ -1356,13 +1358,14 @@ static void do_add_index_objects_to_pending(struct rev_info *revs,
                blob = lookup_blob(revs->repo, &ce->oid);
                if (!blob)
                        die("unable to add index blob to traversal");
                blob = lookup_blob(revs->repo, &ce->oid);
                if (!blob)
                        die("unable to add index blob to traversal");

+               blob->object.flags |= flags;

                add_pending_object_with_path(revs, &blob->object, "",
                                             ce->ce_mode, ce->name);
        }
 
        if (istate->cache_tree) {
                struct strbuf path = STRBUF_INIT;
                add_pending_object_with_path(revs, &blob->object, "",
                                             ce->ce_mode, ce->name);
        }
 
        if (istate->cache_tree) {
                struct strbuf path = STRBUF_INIT;

-               add_cache_tree(istate->cache_tree, revs, &path);
+               add_cache_tree(istate->cache_tree, revs, &path, flags);

                strbuf_release(&path);
        }
 }
                strbuf_release(&path);
        }
 }


@@ -1372,7 +1375,7 @@ void add_index_objects_to_pending(struct rev_info *revs, unsigned int flags)
        struct worktree **worktrees, **p;
 
        read_index(revs->repo->index);
        struct worktree **worktrees, **p;
 
        read_index(revs->repo->index);

-       do_add_index_objects_to_pending(revs, revs->repo->index);
+       do_add_index_objects_to_pending(revs, revs->repo->index, flags);

 
        if (revs->single_worktree)
                return;
 
        if (revs->single_worktree)
                return;


@@ -1388,7 +1391,7 @@ void add_index_objects_to_pending(struct rev_info *revs, unsigned int flags)
                if (read_index_from(&istate,
                                    worktree_git_path(wt, "index"),
                                    get_worktree_git_dir(wt)) > 0)
                if (read_index_from(&istate,
                                    worktree_git_path(wt, "index"),
                                    get_worktree_git_dir(wt)) > 0)

-                       do_add_index_objects_to_pending(revs, &istate);
+                       do_add_index_objects_to_pending(revs, &istate, flags);

                discard_index(&istate);
        }
        free_worktrees(worktrees);
                discard_index(&istate);
        }
        free_worktrees(worktrees);

diff --git a/t/t6000-rev-list-misc.sh b/t/t6000-rev-list-misc.sh
index fb4d295aa0f17c6aa967555ed92b4bc02884a9b3..05079997291fe295aacc80be1f26fd7002f0a898 100755 (executable)
--- a/t/t6000-rev-list-misc.sh
+++ b/t/t6000-rev-list-misc.sh
@@ -90,11 +90,18 @@ test_expect_success 'rev-list can show index objects' '
        9200b628cf9dc883a85a7abc8d6e6730baee589c two
        EOF
        echo only-in-index >only-in-index &&
        9200b628cf9dc883a85a7abc8d6e6730baee589c two
        EOF
        echo only-in-index >only-in-index &&

+       test_when_finished "git reset --hard" &&

        git add only-in-index &&
        git rev-list --objects --indexed-objects >actual &&
        test_cmp expect actual
 '
 
        git add only-in-index &&
        git rev-list --objects --indexed-objects >actual &&
        test_cmp expect actual
 '
 

+test_expect_success 'rev-list can negate index objects' '
+       git rev-parse HEAD >expect &&
+       git rev-list -1 --objects HEAD --not --indexed-objects >actual &&
+       test_cmp expect actual
+'
+

 test_expect_success '--bisect and --first-parent can not be combined' '
        test_must_fail git rev-list --bisect --first-parent HEAD
 '
 test_expect_success '--bisect and --first-parent can not be combined' '
        test_must_fail git rev-list --bisect --first-parent HEAD
 '