diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-08-07 20:44:49 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-08-07 20:44:49 -0700 |
commit | 7ecc9b153c89aeec7470256f7b121fd845101b57 (patch) | |
tree | 0bf662b5dd1ffe642756f5cb168902a89b60506a /revision.c | |
parent | verify-pack: migrate to parse-options (diff) | |
parent | Merge branch 'maint-1.6.3' into maint (diff) | |
download | tgif-7ecc9b153c89aeec7470256f7b121fd845101b57.tar.xz |
Merge branch 'maint' into jc/verify-pack-stat
* maint: (95 commits)
verify-pack -v: do not report "chain length 0"
t5510: harden the way verify-pack is used
gitweb/README: Document $base_url
Documentation: git submodule: add missing options to synopsis
Better usage string for reflog.
hg-to-git: don't import the unused popen2 module
send-email: remove debug trace
config: Keep inner whitespace verbatim
GIT 1.6.4
GIT 1.6.3.4
config.txt: document add.ignore-errors
request-pull: allow ls-remote to notice remote.$nickname.uploadpack
Update the documentation of the raw diff output format
git-rerere.txt: Clarify ambiguity of the config variable
t9143: do not fail if Compress::Zlib is missing
Trivial path quoting fixes in git-instaweb
GIT 1.6.4-rc3
Documentation/config.txt: a variable can be defined on the section header line
git svn: make minimize URL more reliable over http(s)
Disable asciidoc 8.4.1+ semantics for `{plus}` and friends
...
Diffstat (limited to 'revision.c')
-rw-r--r-- | revision.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/revision.c b/revision.c index a31434bdc8..9f5dac5f1d 100644 --- a/revision.c +++ b/revision.c @@ -133,7 +133,7 @@ void mark_parents_uninteresting(struct commit *commit) static void add_pending_object_with_mode(struct rev_info *revs, struct object *obj, const char *name, unsigned mode) { if (revs->no_walk && (obj->flags & UNINTERESTING)) - die("object ranges do not make sense when not walking revisions"); + revs->no_walk = 0; if (revs->reflog_info && obj->type == OBJ_COMMIT && add_reflog_for_walk(revs->reflog_info, (struct commit *)obj, name)) |