summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-27 22:15:42 -0800
committerJunio C Hamano <junkio@cox.net>2007-02-27 22:15:42 -0800
commitc4f8f827555dcbbee148fd1daa4821533ead2ea2 (patch)
tree6fe27e7692192451906b072f71ce65909b8fd5e4 /revision.c
parent8538e876b191901b7d37ec34a83287e51df91816 (diff)
parent163d7b9b8536d206eda7eb0eccb0fc211812346f (diff)
downloadgit-c4f8f827555dcbbee148fd1daa4821533ead2ea2.tar.gz
Merge branch 'maint'
* maint: builtin-fmt-merge-msg: fix bugs in --file option index-pack: Loop over pread until data loading is complete. blameview: Fix the browse behavior in blameview Fix minor typos/grammar in user-manual.txt Correct ordering in git-cvsimport's option documentation git-show: Reject native ref Fix git-show man page formatting in the EXAMPLES section
Diffstat (limited to 'revision.c')
-rw-r--r--revision.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/revision.c b/revision.c
index 4cf697e2c1..b84c066cba 100644
--- a/revision.c
+++ b/revision.c
@@ -116,6 +116,8 @@ void mark_parents_uninteresting(struct commit *commit)
void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
{
+ if (revs->no_walk && (obj->flags & UNINTERESTING))
+ die("object ranges do not make sense when not walking revisions");
add_object_array(obj, name, &revs->pending);
if (revs->reflog_info && obj->type == OBJ_COMMIT)
add_reflog_for_walk(revs->reflog_info,