summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-06-17 17:15:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-06-17 17:15:16 (GMT)
commit3a54d80ac8a1decac6fa158175fb16f0563f5c15 (patch)
treec03c5ef49769d02e8d20558ffbb8017613e38b87 /builtin/merge.c
parent5b476dc2f13324852d0dbf7f2e5c020d1064ac8c (diff)
parent3bbbe467f294fae8a286e47af676fa783ad970c1 (diff)
downloadgit-3a54d80ac8a1decac6fa158175fb16f0563f5c15.zip
git-3a54d80ac8a1decac6fa158175fb16f0563f5c15.tar.gz
git-3a54d80ac8a1decac6fa158175fb16f0563f5c15.tar.bz2
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
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions