mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
Merge branch 'js/bundle-verify-require-object-store'
"git bundle verify" needs to see if prerequisite objects exist in the receiving repository, but the command did not check if we are in a repository upfront, which has been corrected. * js/bundle-verify-require-object-store: bundle verify: error out if called without an object database
This commit is contained in:
commit
3a54d80ac8
3
bundle.c
3
bundle.c
|
@ -142,6 +142,9 @@ int verify_bundle(struct repository *r,
|
|||
int i, ret = 0, req_nr;
|
||||
const char *message = _("Repository lacks these prerequisite commits:");
|
||||
|
||||
if (!r || !r->objects || !r->objects->odb)
|
||||
return error(_("need a repository to verify a bundle"));
|
||||
|
||||
repo_init_revisions(r, &revs, NULL);
|
||||
for (i = 0; i < p->nr; i++) {
|
||||
struct ref_list_entry *e = p->list + i;
|
||||
|
|
|
@ -14,6 +14,12 @@ test_expect_success 'setup' '
|
|||
git tag -d third
|
||||
'
|
||||
|
||||
test_expect_success '"verify" needs a worktree' '
|
||||
git bundle create tip.bundle -1 master &&
|
||||
test_must_fail nongit git bundle verify ../tip.bundle 2>err &&
|
||||
test_i18ngrep "need a repository" err
|
||||
'
|
||||
|
||||
test_expect_success 'annotated tags can be excluded by rev-list options' '
|
||||
git bundle create bundle --all --since=7.Apr.2005.15:14:00.-0700 &&
|
||||
git ls-remote bundle > output &&
|
||||
|
|
Loading…
Reference in a new issue