summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-07-25 14:27:09 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-07-25 14:27:10 -0700
commitabbd50428e1215933f83a458f2842f5a6e0a21ee (patch)
treec619e0ceb25967a413f9cc0bce1676fec9ffc01f /builtin/merge.c
parentMerge branch 'jk/am-i-resolved-fix' into maint (diff)
parentbundle verify: error out if called without an object database (diff)
downloadtgif-abbd50428e1215933f83a458f2842f5a6e0a21ee.tar.xz
Merge branch 'js/bundle-verify-require-object-store' into maint
"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
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions