Matthew DeVore <matvore@xxxxxxxxxx> writes: > When a command is invoked with both --exclude-promisor-objects, > --objects-edge-aggressive, and a missing object on the command line, > the rev_info.cmdline array could get a NULL pointer for the value of > an 'item' field. Prevent dereferencing of a NULL pointer in that > situation. > > Properly handle --ignore-missing. If it is not passed, die when an > object is missing. Otherwise, just silently ignore it. > > Signed-off-by: Matthew DeVore <matvore@xxxxxxxxxx> Thanks for an update. Will replace. > --- > revision.c | 2 ++ > t/t0410-partial-clone.sh | 16 ++++++++++++++-- > 2 files changed, 16 insertions(+), 2 deletions(-) > > diff --git a/revision.c b/revision.c > index 13e0519c02..293303b67d 100644 > --- a/revision.c > +++ b/revision.c > @@ -1729,6 +1729,8 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsi > if (!cant_be_filename) > verify_non_filename(revs->prefix, arg); > object = get_reference(revs, arg, &oid, flags ^ local_flags); > + if (!object) > + return revs->ignore_missing ? 0 : -1; > add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags); > add_pending_object_with_path(revs, object, arg, oc.mode, oc.path); > free(oc.path); > diff --git a/t/t0410-partial-clone.sh b/t/t0410-partial-clone.sh > index ba3887f178..169f7f10a7 100755 > --- a/t/t0410-partial-clone.sh > +++ b/t/t0410-partial-clone.sh > @@ -349,7 +349,7 @@ test_expect_success 'rev-list stops traversal at promisor commit, tree, and blob > grep $(git -C repo rev-parse bar) out # sanity check that some walking was done > ' > > -test_expect_success 'rev-list accepts missing and promised objects on command line' ' > +test_expect_success 'rev-list dies for missing objects on cmd line' ' > rm -rf repo && > test_create_repo repo && > test_commit -C repo foo && > @@ -366,7 +366,19 @@ test_expect_success 'rev-list accepts missing and promised objects on command li > > git -C repo config core.repositoryformatversion 1 && > git -C repo config extensions.partialclone "arbitrary string" && > - git -C repo rev-list --exclude-promisor-objects --objects "$COMMIT" "$TREE" "$BLOB" > + > + for OBJ in "$COMMIT" "$TREE" "$BLOB"; do > + test_must_fail git -C repo rev-list --objects \ > + --exclude-promisor-objects "$OBJ" && > + test_must_fail git -C repo rev-list --objects-edge-aggressive \ > + --exclude-promisor-objects "$OBJ" && > + > + # Do not die or crash when --ignore-missing is passed. > + git -C repo rev-list --ignore-missing --objects \ > + --exclude-promisor-objects "$OBJ" && > + git -C repo rev-list --ignore-missing --objects-edge-aggressive \ > + --exclude-promisor-objects "$OBJ" > + done > ' > > test_expect_success 'gc repacks promisor objects separately from non-promisor objects' '
