diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-05-08 18:37:25 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-08 18:37:25 +0300 |
| commit | ea2dab1abbf14bfa7dd5299c9bb86d0f70aae019 (patch) | |
| tree | 053b83263d2b4c5d5ab6b0b51a9dcfdb864808bf /builtin/rev-list.c | |
| parent | 0b179f3175d1a152b1d22ce8352efda34b258ce2 (diff) | |
| parent | 97dd512af7ce4afb4f638ef73b4770921c8ca3aa (diff) | |
Merge branch 'tb/unexpected'
Code tightening against a "wrong" object appearing where an object
of a different type is expected, instead of blindly assuming that
the connection between objects are correctly made.
* tb/unexpected:
rev-list: detect broken root trees
rev-list: let traversal die when --missing is not in use
get_commit_tree(): return NULL for broken tree
list-objects.c: handle unexpected non-tree entries
list-objects.c: handle unexpected non-blob entries
t: introduce tests for unexpected object types
t: move 'hex2oct' into test-lib-functions.sh
Diffstat (limited to 'builtin/rev-list.c')
| -rw-r--r-- | builtin/rev-list.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin/rev-list.c b/builtin/rev-list.c index 425a5774db..9f31837d30 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -379,7 +379,6 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) repo_init_revisions(the_repository, &revs, prefix); revs.abbrev = DEFAULT_ABBREV; revs.commit_format = CMIT_FMT_UNSPECIFIED; - revs.do_not_die_on_missing_tree = 1; /* * Scan the argument list before invoking setup_revisions(), so that we @@ -409,6 +408,9 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) } } + if (arg_missing_action) + revs.do_not_die_on_missing_tree = 1; + argc = setup_revisions(argc, argv, &revs, &s_r_opt); memset(&info, 0, sizeof(info)); |