Merge branch 'sg/test-must-be-empty'

[thirdparty/git.git] / revision.c

diff --git a/revision.c b/revision.c
index 8bd2e27037d8136ec96d31ed1a41eb45a040e475..de4dce600d00282655907e9014228791a352f813 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -251,6 +251,9 @@ static struct commit *handle_commit(struct rev_info *revs,
                if (!object) {
                        if (revs->ignore_missing_links || (flags & UNINTERESTING))
                                return NULL;
+                       if (revs->exclude_promisor_objects &&
+                           is_promisor_object(&tag->tagged->oid))
+                               return NULL;
                        die("bad object %s", oid_to_hex(&tag->tagged->oid));
                }
                object->flags |= flags;
@@ -1514,7 +1517,7 @@ static void prepare_show_merge(struct rev_info *revs)
                const struct cache_entry *ce = active_cache[i];
                if (!ce_stage(ce))
                        continue;
-               if (ce_path_match(ce, &revs->prune_data, NULL)) {
+               if (ce_path_match(&the_index, ce, &revs->prune_data, NULL)) {
                        prune_num++;
                        REALLOC_ARRAY(prune, prune_num);
                        prune[prune_num-2] = ce->name;