rugged 0.19.0 → 0.28.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +7 -0
- data/LICENSE +1 -1
- data/README.md +184 -33
- data/ext/rugged/extconf.rb +111 -28
- data/ext/rugged/rugged.c +327 -89
- data/ext/rugged/rugged.h +64 -28
- data/ext/rugged/rugged_allocator.c +89 -0
- data/ext/rugged/rugged_backend.c +17 -0
- data/ext/rugged/rugged_blame.c +278 -0
- data/ext/rugged/rugged_blob.c +301 -75
- data/ext/rugged/rugged_branch.c +92 -242
- data/ext/rugged/rugged_branch_collection.c +388 -0
- data/ext/rugged/rugged_commit.c +575 -79
- data/ext/rugged/rugged_config.c +129 -36
- data/ext/rugged/rugged_cred.c +131 -0
- data/ext/rugged/rugged_diff.c +291 -122
- data/ext/rugged/rugged_diff_delta.c +16 -22
- data/ext/rugged/rugged_diff_hunk.c +35 -51
- data/ext/rugged/rugged_diff_line.c +23 -36
- data/ext/rugged/rugged_index.c +289 -152
- data/ext/rugged/rugged_note.c +50 -60
- data/ext/rugged/rugged_object.c +13 -30
- data/ext/rugged/rugged_patch.c +400 -0
- data/ext/rugged/rugged_rebase.c +397 -0
- data/ext/rugged/rugged_reference.c +76 -346
- data/ext/rugged/rugged_reference_collection.c +423 -0
- data/ext/rugged/rugged_remote.c +438 -461
- data/ext/rugged/rugged_remote_collection.c +435 -0
- data/ext/rugged/rugged_repo.c +1548 -365
- data/ext/rugged/rugged_revwalk.c +378 -99
- data/ext/rugged/rugged_settings.c +86 -23
- data/ext/rugged/rugged_signature.c +47 -37
- data/ext/rugged/rugged_submodule.c +835 -0
- data/ext/rugged/rugged_submodule_collection.c +366 -0
- data/ext/rugged/rugged_tag.c +88 -210
- data/ext/rugged/rugged_tag_collection.c +326 -0
- data/ext/rugged/rugged_tree.c +460 -217
- data/lib/rugged/attributes.rb +46 -0
- data/lib/rugged/blob.rb +33 -0
- data/lib/rugged/branch.rb +12 -16
- data/lib/rugged/commit.rb +9 -0
- data/lib/rugged/console.rb +5 -0
- data/lib/rugged/credentials.rb +48 -0
- data/lib/rugged/diff/delta.rb +6 -2
- data/lib/rugged/diff/hunk.rb +9 -9
- data/lib/rugged/diff/line.rb +28 -5
- data/lib/rugged/diff.rb +7 -1
- data/lib/rugged/index.rb +120 -0
- data/lib/rugged/object.rb +5 -0
- data/lib/rugged/patch.rb +41 -0
- data/lib/rugged/reference.rb +6 -3
- data/lib/rugged/remote.rb +5 -9
- data/lib/rugged/repository.rb +126 -14
- data/lib/rugged/submodule_collection.rb +53 -0
- data/lib/rugged/tag.rb +45 -16
- data/lib/rugged/tree.rb +163 -1
- data/lib/rugged/version.rb +6 -1
- data/lib/rugged/walker.rb +5 -0
- data/lib/rugged.rb +16 -1
- data/vendor/libgit2/AUTHORS +77 -0
- data/vendor/libgit2/CMakeLists.txt +317 -0
- data/vendor/libgit2/COPYING +993 -0
- data/vendor/libgit2/cmake/Modules/AddCFlagIfSupported.cmake +30 -0
- data/vendor/libgit2/cmake/Modules/CheckPrototypeDefinition.c.in +29 -0
- data/vendor/libgit2/cmake/Modules/CheckPrototypeDefinition.cmake +96 -0
- data/vendor/libgit2/cmake/Modules/EnableWarnings.cmake +11 -0
- data/vendor/libgit2/cmake/Modules/FindCoreFoundation.cmake +26 -0
- data/vendor/libgit2/cmake/Modules/FindGSSAPI.cmake +324 -0
- data/vendor/libgit2/cmake/Modules/FindHTTP_Parser.cmake +39 -0
- data/vendor/libgit2/cmake/Modules/FindIconv.cmake +45 -0
- data/vendor/libgit2/cmake/Modules/FindPkgLibraries.cmake +28 -0
- data/vendor/libgit2/cmake/Modules/FindSecurity.cmake +28 -0
- data/vendor/libgit2/cmake/Modules/FindStatNsec.cmake +20 -0
- data/vendor/libgit2/cmake/Modules/FindmbedTLS.cmake +93 -0
- data/vendor/libgit2/cmake/Modules/IdeSplitSources.cmake +22 -0
- data/vendor/libgit2/deps/http-parser/CMakeLists.txt +5 -0
- data/vendor/libgit2/deps/http-parser/COPYING +23 -0
- data/vendor/libgit2/deps/http-parser/http_parser.c +5 -2
- data/vendor/libgit2/deps/http-parser/http_parser.h +2 -0
- data/vendor/libgit2/deps/regex/CMakeLists.txt +2 -0
- data/vendor/libgit2/deps/regex/COPYING +502 -0
- data/vendor/libgit2/deps/regex/regex.c +10 -3
- data/vendor/libgit2/deps/winhttp/CMakeLists.txt +26 -0
- data/vendor/libgit2/deps/winhttp/COPYING.GPL +993 -0
- data/vendor/libgit2/deps/winhttp/COPYING.LGPL +502 -0
- data/vendor/libgit2/deps/winhttp/urlmon.h +45 -0
- data/vendor/libgit2/deps/winhttp/winhttp.def +29 -0
- data/vendor/libgit2/deps/winhttp/winhttp.h +594 -0
- data/vendor/libgit2/deps/winhttp/winhttp64.def +29 -0
- data/vendor/libgit2/deps/zlib/CMakeLists.txt +5 -0
- data/vendor/libgit2/deps/zlib/COPYING +27 -0
- data/vendor/libgit2/deps/zlib/adler32.c +51 -34
- data/vendor/libgit2/deps/zlib/crc32.c +61 -61
- data/vendor/libgit2/deps/zlib/crc32.h +1 -1
- data/vendor/libgit2/deps/zlib/deflate.c +681 -352
- data/vendor/libgit2/deps/zlib/deflate.h +25 -18
- data/vendor/libgit2/deps/zlib/gzguts.h +218 -0
- data/vendor/libgit2/deps/zlib/infback.c +640 -0
- data/vendor/libgit2/deps/zlib/inffast.c +36 -53
- data/vendor/libgit2/deps/zlib/inffixed.h +3 -3
- data/vendor/libgit2/deps/zlib/inflate.c +167 -86
- data/vendor/libgit2/deps/zlib/inflate.h +7 -4
- data/vendor/libgit2/deps/zlib/inftrees.c +24 -50
- data/vendor/libgit2/deps/zlib/trees.c +55 -96
- data/vendor/libgit2/deps/zlib/zconf.h +499 -19
- data/vendor/libgit2/deps/zlib/zlib.h +526 -227
- data/vendor/libgit2/deps/zlib/zutil.c +39 -32
- data/vendor/libgit2/deps/zlib/zutil.h +75 -78
- data/vendor/libgit2/include/git2/annotated_commit.h +125 -0
- data/vendor/libgit2/include/git2/apply.h +129 -0
- data/vendor/libgit2/include/git2/attr.h +36 -21
- data/vendor/libgit2/include/git2/blame.h +229 -0
- data/vendor/libgit2/include/git2/blob.h +81 -44
- data/vendor/libgit2/include/git2/branch.h +81 -42
- data/vendor/libgit2/include/git2/buffer.h +128 -0
- data/vendor/libgit2/include/git2/checkout.h +141 -67
- data/vendor/libgit2/include/git2/cherrypick.h +92 -0
- data/vendor/libgit2/include/git2/clone.h +157 -58
- data/vendor/libgit2/include/git2/commit.h +231 -12
- data/vendor/libgit2/include/git2/common.h +216 -30
- data/vendor/libgit2/include/git2/config.h +274 -48
- data/vendor/libgit2/include/git2/cred_helpers.h +4 -4
- data/vendor/libgit2/include/git2/deprecated.h +253 -0
- data/vendor/libgit2/include/git2/describe.h +189 -0
- data/vendor/libgit2/include/git2/diff.h +985 -575
- data/vendor/libgit2/include/git2/errors.h +93 -52
- data/vendor/libgit2/include/git2/filter.h +217 -0
- data/vendor/libgit2/include/git2/global.h +44 -0
- data/vendor/libgit2/include/git2/graph.h +17 -0
- data/vendor/libgit2/include/git2/ignore.h +2 -2
- data/vendor/libgit2/include/git2/index.h +269 -94
- data/vendor/libgit2/include/git2/indexer.h +44 -12
- data/vendor/libgit2/include/git2/mailmap.h +115 -0
- data/vendor/libgit2/include/git2/merge.h +501 -64
- data/vendor/libgit2/include/git2/message.h +52 -17
- data/vendor/libgit2/include/git2/net.h +11 -5
- data/vendor/libgit2/include/git2/notes.h +120 -16
- data/vendor/libgit2/include/git2/object.h +62 -23
- data/vendor/libgit2/include/git2/odb.h +140 -24
- data/vendor/libgit2/include/git2/odb_backend.h +56 -12
- data/vendor/libgit2/include/git2/oid.h +17 -18
- data/vendor/libgit2/include/git2/oidarray.h +40 -0
- data/vendor/libgit2/include/git2/pack.h +86 -7
- data/vendor/libgit2/include/git2/patch.h +274 -0
- data/vendor/libgit2/include/git2/pathspec.h +280 -0
- data/vendor/libgit2/include/git2/proxy.h +96 -0
- data/vendor/libgit2/include/git2/rebase.h +323 -0
- data/vendor/libgit2/include/git2/reflog.h +12 -9
- data/vendor/libgit2/include/git2/refs.h +241 -46
- data/vendor/libgit2/include/git2/refspec.h +20 -4
- data/vendor/libgit2/include/git2/remote.h +636 -209
- data/vendor/libgit2/include/git2/repository.h +267 -57
- data/vendor/libgit2/include/git2/reset.h +36 -6
- data/vendor/libgit2/include/git2/revert.h +91 -0
- data/vendor/libgit2/include/git2/revparse.h +27 -16
- data/vendor/libgit2/include/git2/revwalk.h +78 -35
- data/vendor/libgit2/include/git2/signature.h +32 -5
- data/vendor/libgit2/include/git2/stash.h +160 -21
- data/vendor/libgit2/include/git2/status.h +92 -30
- data/vendor/libgit2/include/git2/submodule.h +226 -133
- data/vendor/libgit2/include/git2/sys/alloc.h +101 -0
- data/vendor/libgit2/include/git2/sys/commit.h +38 -4
- data/vendor/libgit2/include/git2/sys/config.h +68 -9
- data/vendor/libgit2/include/git2/sys/diff.h +94 -0
- data/vendor/libgit2/include/git2/sys/filter.h +332 -0
- data/vendor/libgit2/include/git2/sys/hashsig.h +106 -0
- data/vendor/libgit2/include/git2/sys/index.h +6 -5
- data/vendor/libgit2/include/git2/sys/mempack.h +86 -0
- data/vendor/libgit2/include/git2/sys/merge.h +182 -0
- data/vendor/libgit2/include/git2/sys/odb_backend.h +66 -28
- data/vendor/libgit2/include/git2/sys/openssl.h +38 -0
- data/vendor/libgit2/include/git2/sys/path.h +64 -0
- data/vendor/libgit2/include/git2/sys/refdb_backend.h +79 -19
- data/vendor/libgit2/include/git2/sys/reflog.h +21 -0
- data/vendor/libgit2/include/git2/sys/refs.h +13 -2
- data/vendor/libgit2/include/git2/sys/repository.h +64 -1
- data/vendor/libgit2/include/git2/sys/stream.h +138 -0
- data/vendor/libgit2/include/git2/sys/time.h +31 -0
- data/vendor/libgit2/include/git2/sys/transport.h +439 -0
- data/vendor/libgit2/include/git2/tag.h +11 -2
- data/vendor/libgit2/include/git2/trace.h +1 -1
- data/vendor/libgit2/include/git2/transaction.h +121 -0
- data/vendor/libgit2/include/git2/transport.h +261 -292
- data/vendor/libgit2/include/git2/tree.h +111 -21
- data/vendor/libgit2/include/git2/types.h +244 -32
- data/vendor/libgit2/include/git2/version.h +5 -2
- data/vendor/libgit2/include/git2/worktree.h +255 -0
- data/vendor/libgit2/include/git2.h +50 -40
- data/vendor/libgit2/libgit2.pc.in +13 -0
- data/vendor/libgit2/src/CMakeLists.txt +525 -0
- data/vendor/libgit2/src/alloc.c +55 -0
- data/vendor/libgit2/src/alloc.h +40 -0
- data/vendor/libgit2/src/annotated_commit.c +228 -0
- data/vendor/libgit2/src/annotated_commit.h +52 -0
- data/vendor/libgit2/src/apply.c +855 -0
- data/vendor/libgit2/src/apply.h +25 -0
- data/vendor/libgit2/src/array.h +74 -16
- data/vendor/libgit2/src/attr.c +239 -408
- data/vendor/libgit2/src/attr.h +3 -33
- data/vendor/libgit2/src/attr_file.c +424 -156
- data/vendor/libgit2/src/attr_file.h +95 -23
- data/vendor/libgit2/src/attrcache.c +469 -0
- data/vendor/libgit2/src/attrcache.h +37 -5
- data/vendor/libgit2/src/bitvec.h +75 -0
- data/vendor/libgit2/src/blame.c +532 -0
- data/vendor/libgit2/src/blame.h +95 -0
- data/vendor/libgit2/src/blame_git.c +668 -0
- data/vendor/libgit2/src/blame_git.h +22 -0
- data/vendor/libgit2/src/blob.c +233 -129
- data/vendor/libgit2/src/blob.h +29 -1
- data/vendor/libgit2/src/branch.c +295 -197
- data/vendor/libgit2/src/branch.h +2 -0
- data/vendor/libgit2/src/buf_text.c +52 -27
- data/vendor/libgit2/src/buf_text.h +7 -7
- data/vendor/libgit2/src/buffer.c +609 -52
- data/vendor/libgit2/src/buffer.h +68 -23
- data/vendor/libgit2/src/cache.c +48 -51
- data/vendor/libgit2/src/cache.h +6 -4
- data/vendor/libgit2/src/cc-compat.h +35 -7
- data/vendor/libgit2/src/checkout.c +1827 -483
- data/vendor/libgit2/src/checkout.h +4 -1
- data/vendor/libgit2/src/cherrypick.c +230 -0
- data/vendor/libgit2/src/clone.c +338 -258
- data/vendor/libgit2/src/{compress.h → clone.h} +5 -5
- data/vendor/libgit2/src/commit.c +711 -124
- data/vendor/libgit2/src/commit.h +10 -3
- data/vendor/libgit2/src/commit_list.c +21 -14
- data/vendor/libgit2/src/commit_list.h +9 -3
- data/vendor/libgit2/src/common.h +153 -13
- data/vendor/libgit2/src/config.c +871 -242
- data/vendor/libgit2/src/config.h +58 -14
- data/vendor/libgit2/src/config_backend.h +84 -0
- data/vendor/libgit2/src/config_cache.c +44 -18
- data/vendor/libgit2/src/config_entries.c +259 -0
- data/vendor/libgit2/src/config_entries.h +23 -0
- data/vendor/libgit2/src/config_file.c +837 -1113
- data/vendor/libgit2/src/config_mem.c +224 -0
- data/vendor/libgit2/src/config_parse.c +558 -0
- data/vendor/libgit2/src/config_parse.h +64 -0
- data/vendor/libgit2/src/crlf.c +290 -195
- data/vendor/libgit2/src/date.c +35 -7
- data/vendor/libgit2/src/delta.c +275 -71
- data/vendor/libgit2/src/delta.h +80 -58
- data/vendor/libgit2/src/describe.c +893 -0
- data/vendor/libgit2/src/diff.c +330 -1128
- data/vendor/libgit2/src/diff.h +25 -67
- data/vendor/libgit2/src/diff_driver.c +225 -109
- data/vendor/libgit2/src/diff_driver.h +5 -2
- data/vendor/libgit2/src/diff_file.c +128 -103
- data/vendor/libgit2/src/diff_file.h +17 -12
- data/vendor/libgit2/src/diff_generate.c +1622 -0
- data/vendor/libgit2/src/diff_generate.h +128 -0
- data/vendor/libgit2/src/diff_parse.c +108 -0
- data/vendor/libgit2/src/diff_parse.h +20 -0
- data/vendor/libgit2/src/diff_print.c +578 -218
- data/vendor/libgit2/src/diff_stats.c +362 -0
- data/vendor/libgit2/src/diff_tform.c +429 -257
- data/vendor/libgit2/src/diff_tform.h +25 -0
- data/vendor/libgit2/src/diff_xdiff.c +143 -46
- data/vendor/libgit2/src/diff_xdiff.h +12 -5
- data/vendor/libgit2/src/errors.c +150 -34
- data/vendor/libgit2/src/features.h.in +37 -0
- data/vendor/libgit2/src/fetch.c +69 -46
- data/vendor/libgit2/src/fetch.h +6 -12
- data/vendor/libgit2/src/fetchhead.c +40 -33
- data/vendor/libgit2/src/fetchhead.h +5 -4
- data/vendor/libgit2/src/filebuf.c +163 -61
- data/vendor/libgit2/src/filebuf.h +13 -7
- data/vendor/libgit2/src/fileops.c +549 -407
- data/vendor/libgit2/src/fileops.h +97 -106
- data/vendor/libgit2/src/filter.c +989 -46
- data/vendor/libgit2/src/filter.h +21 -70
- data/vendor/libgit2/src/fnmatch.c +67 -11
- data/vendor/libgit2/src/fnmatch.h +27 -7
- data/vendor/libgit2/src/global.c +257 -63
- data/vendor/libgit2/src/global.h +19 -0
- data/vendor/libgit2/src/graph.c +39 -23
- data/vendor/libgit2/src/hash/hash_collisiondetect.h +51 -0
- data/vendor/libgit2/src/hash/hash_common_crypto.h +61 -0
- data/vendor/libgit2/src/hash/hash_generic.c +3 -3
- data/vendor/libgit2/src/hash/hash_generic.h +10 -5
- data/vendor/libgit2/src/hash/hash_mbedtls.c +38 -0
- data/vendor/libgit2/src/hash/hash_mbedtls.h +24 -0
- data/vendor/libgit2/src/hash/hash_openssl.h +26 -8
- data/vendor/libgit2/src/hash/hash_win32.c +71 -43
- data/vendor/libgit2/src/hash/hash_win32.h +4 -3
- data/vendor/libgit2/src/hash/sha1dc/sha1.c +1900 -0
- data/vendor/libgit2/src/hash/sha1dc/sha1.h +110 -0
- data/vendor/libgit2/src/hash/sha1dc/ubc_check.c +372 -0
- data/vendor/libgit2/src/hash/sha1dc/ubc_check.h +52 -0
- data/vendor/libgit2/src/hash.c +0 -1
- data/vendor/libgit2/src/hash.h +13 -6
- data/vendor/libgit2/src/hashsig.c +121 -126
- data/vendor/libgit2/src/ident.c +129 -0
- data/vendor/libgit2/src/idxmap.c +153 -0
- data/vendor/libgit2/src/idxmap.h +41 -0
- data/vendor/libgit2/src/ignore.c +362 -123
- data/vendor/libgit2/src/ignore.h +16 -4
- data/vendor/libgit2/src/index.c +2131 -692
- data/vendor/libgit2/src/index.h +138 -6
- data/vendor/libgit2/src/indexer.c +866 -266
- data/vendor/libgit2/src/indexer.h +16 -0
- data/vendor/libgit2/src/integer.h +106 -0
- data/vendor/libgit2/src/iterator.c +1888 -967
- data/vendor/libgit2/src/iterator.h +130 -67
- data/vendor/libgit2/src/khash.h +43 -29
- data/vendor/libgit2/src/mailmap.c +485 -0
- data/vendor/libgit2/src/mailmap.h +35 -0
- data/vendor/libgit2/src/map.h +1 -1
- data/vendor/libgit2/src/merge.c +1679 -479
- data/vendor/libgit2/src/merge.h +89 -22
- data/vendor/libgit2/src/merge_driver.c +426 -0
- data/vendor/libgit2/src/merge_driver.h +62 -0
- data/vendor/libgit2/src/merge_file.c +238 -101
- data/vendor/libgit2/src/message.c +4 -28
- data/vendor/libgit2/src/message.h +3 -1
- data/vendor/libgit2/src/mwindow.c +123 -15
- data/vendor/libgit2/src/mwindow.h +10 -1
- data/vendor/libgit2/src/netops.c +178 -499
- data/vendor/libgit2/src/netops.h +51 -27
- data/vendor/libgit2/src/notes.c +251 -94
- data/vendor/libgit2/src/notes.h +5 -2
- data/vendor/libgit2/src/object.c +253 -67
- data/vendor/libgit2/src/object.h +40 -2
- data/vendor/libgit2/src/object_api.c +30 -11
- data/vendor/libgit2/src/odb.c +765 -201
- data/vendor/libgit2/src/odb.h +40 -8
- data/vendor/libgit2/src/odb_loose.c +560 -346
- data/vendor/libgit2/src/odb_mempack.c +185 -0
- data/vendor/libgit2/src/odb_pack.c +117 -73
- data/vendor/libgit2/src/offmap.c +113 -0
- data/vendor/libgit2/src/offmap.h +32 -42
- data/vendor/libgit2/src/oid.c +45 -25
- data/vendor/libgit2/src/oid.h +26 -8
- data/vendor/libgit2/src/oidarray.c +34 -0
- data/vendor/libgit2/src/oidarray.h +20 -0
- data/vendor/libgit2/src/oidmap.c +125 -0
- data/vendor/libgit2/src/oidmap.h +30 -17
- data/vendor/libgit2/src/pack-objects.c +688 -265
- data/vendor/libgit2/src/pack-objects.h +27 -13
- data/vendor/libgit2/src/pack.c +418 -202
- data/vendor/libgit2/src/pack.h +25 -16
- data/vendor/libgit2/src/parse.c +124 -0
- data/vendor/libgit2/src/parse.h +61 -0
- data/vendor/libgit2/src/patch.c +223 -0
- data/vendor/libgit2/src/patch.h +68 -0
- data/vendor/libgit2/src/patch_generate.c +901 -0
- data/vendor/libgit2/src/patch_generate.h +69 -0
- data/vendor/libgit2/src/patch_parse.c +1136 -0
- data/vendor/libgit2/src/patch_parse.h +51 -0
- data/vendor/libgit2/src/path.c +1247 -241
- data/vendor/libgit2/src/path.h +353 -57
- data/vendor/libgit2/src/pathspec.c +586 -58
- data/vendor/libgit2/src/pathspec.h +37 -15
- data/vendor/libgit2/src/pool.c +134 -221
- data/vendor/libgit2/src/pool.h +38 -50
- data/vendor/libgit2/src/posix.c +76 -10
- data/vendor/libgit2/src/posix.h +74 -32
- data/vendor/libgit2/src/pqueue.c +79 -117
- data/vendor/libgit2/src/pqueue.h +38 -82
- data/vendor/libgit2/src/proxy.c +39 -0
- data/vendor/libgit2/src/proxy.h +17 -0
- data/vendor/libgit2/src/push.c +178 -279
- data/vendor/libgit2/src/push.h +93 -4
- data/vendor/libgit2/src/reader.c +265 -0
- data/vendor/libgit2/src/reader.h +107 -0
- data/vendor/libgit2/src/rebase.c +1364 -0
- data/vendor/libgit2/src/refdb.c +74 -19
- data/vendor/libgit2/src/refdb.h +16 -3
- data/vendor/libgit2/src/refdb_fs.c +1472 -603
- data/vendor/libgit2/src/refdb_fs.h +4 -0
- data/vendor/libgit2/src/reflog.c +40 -330
- data/vendor/libgit2/src/reflog.h +8 -2
- data/vendor/libgit2/src/refs.c +641 -225
- data/vendor/libgit2/src/refs.h +53 -6
- data/vendor/libgit2/src/refspec.c +175 -62
- data/vendor/libgit2/src/refspec.h +10 -25
- data/vendor/libgit2/src/remote.c +1741 -723
- data/vendor/libgit2/src/remote.h +17 -5
- data/vendor/libgit2/src/repository.c +1505 -421
- data/vendor/libgit2/src/repository.h +95 -15
- data/vendor/libgit2/src/reset.c +63 -26
- data/vendor/libgit2/src/revert.c +232 -0
- data/vendor/libgit2/src/revparse.c +94 -80
- data/vendor/libgit2/src/revwalk.c +427 -194
- data/vendor/libgit2/src/revwalk.h +14 -5
- data/vendor/libgit2/src/settings.c +290 -0
- data/vendor/libgit2/src/sha1_lookup.c +16 -159
- data/vendor/libgit2/src/sha1_lookup.h +5 -4
- data/vendor/libgit2/src/signature.c +138 -26
- data/vendor/libgit2/src/signature.h +5 -0
- data/vendor/libgit2/src/sortedcache.c +395 -0
- data/vendor/libgit2/src/sortedcache.h +180 -0
- data/vendor/libgit2/src/stash.c +629 -168
- data/vendor/libgit2/src/status.c +125 -75
- data/vendor/libgit2/src/status.h +4 -2
- data/vendor/libgit2/src/stdalloc.c +120 -0
- data/vendor/libgit2/src/stdalloc.h +17 -0
- data/vendor/libgit2/src/stream.h +86 -0
- data/vendor/libgit2/src/streams/mbedtls.c +483 -0
- data/vendor/libgit2/src/streams/mbedtls.h +23 -0
- data/vendor/libgit2/src/streams/openssl.c +789 -0
- data/vendor/libgit2/src/streams/openssl.h +23 -0
- data/vendor/libgit2/src/streams/registry.c +118 -0
- data/vendor/libgit2/src/streams/registry.h +19 -0
- data/vendor/libgit2/src/streams/socket.c +235 -0
- data/vendor/libgit2/src/streams/socket.h +23 -0
- data/vendor/libgit2/src/streams/stransport.c +323 -0
- data/vendor/libgit2/src/streams/stransport.h +21 -0
- data/vendor/libgit2/src/streams/tls.c +73 -0
- data/vendor/libgit2/src/streams/tls.h +31 -0
- data/vendor/libgit2/src/strmap.c +147 -0
- data/vendor/libgit2/src/strmap.h +46 -51
- data/vendor/libgit2/src/strnlen.h +24 -0
- data/vendor/libgit2/src/submodule.c +1633 -877
- data/vendor/libgit2/src/submodule.h +83 -21
- data/vendor/libgit2/src/sysdir.c +355 -0
- data/vendor/libgit2/src/sysdir.h +119 -0
- data/vendor/libgit2/src/tag.c +87 -62
- data/vendor/libgit2/src/tag.h +4 -1
- data/vendor/libgit2/src/thread-utils.c +3 -0
- data/vendor/libgit2/src/thread-utils.h +71 -35
- data/vendor/libgit2/src/trace.c +4 -4
- data/vendor/libgit2/src/trace.h +11 -3
- data/vendor/libgit2/src/trailer.c +416 -0
- data/vendor/libgit2/src/transaction.c +382 -0
- data/vendor/libgit2/src/transaction.h +14 -0
- data/vendor/libgit2/src/transport.c +133 -67
- data/vendor/libgit2/src/transports/auth.c +75 -0
- data/vendor/libgit2/src/transports/auth.h +64 -0
- data/vendor/libgit2/src/transports/auth_negotiate.c +277 -0
- data/vendor/libgit2/src/transports/auth_negotiate.h +27 -0
- data/vendor/libgit2/src/transports/cred.c +296 -68
- data/vendor/libgit2/src/transports/cred.h +16 -0
- data/vendor/libgit2/src/transports/cred_helpers.c +4 -0
- data/vendor/libgit2/src/transports/git.c +108 -90
- data/vendor/libgit2/src/transports/http.c +803 -258
- data/vendor/libgit2/src/transports/http.h +25 -0
- data/vendor/libgit2/src/transports/local.c +265 -169
- data/vendor/libgit2/src/transports/smart.c +255 -45
- data/vendor/libgit2/src/transports/smart.h +42 -22
- data/vendor/libgit2/src/transports/smart_pkt.c +250 -159
- data/vendor/libgit2/src/transports/smart_protocol.c +414 -196
- data/vendor/libgit2/src/transports/ssh.c +645 -236
- data/vendor/libgit2/src/transports/ssh.h +14 -0
- data/vendor/libgit2/src/transports/winhttp.c +809 -353
- data/vendor/libgit2/src/tree-cache.c +138 -52
- data/vendor/libgit2/src/tree-cache.h +14 -7
- data/vendor/libgit2/src/tree.c +620 -259
- data/vendor/libgit2/src/tree.h +12 -19
- data/vendor/libgit2/src/tsort.c +3 -2
- data/vendor/libgit2/src/unix/map.c +25 -7
- data/vendor/libgit2/src/unix/posix.h +77 -12
- data/vendor/libgit2/src/unix/pthread.h +56 -0
- data/vendor/libgit2/src/unix/realpath.c +12 -8
- data/vendor/libgit2/src/userdiff.h +208 -0
- data/vendor/libgit2/src/util.c +349 -165
- data/vendor/libgit2/src/util.h +167 -85
- data/vendor/libgit2/src/varint.c +43 -0
- data/vendor/libgit2/src/varint.h +17 -0
- data/vendor/libgit2/src/vector.c +156 -33
- data/vendor/libgit2/src/vector.h +41 -5
- data/vendor/libgit2/src/win32/dir.c +22 -42
- data/vendor/libgit2/src/win32/dir.h +7 -5
- data/vendor/libgit2/src/win32/error.c +6 -32
- data/vendor/libgit2/src/win32/error.h +4 -2
- data/vendor/libgit2/src/win32/findfile.c +62 -69
- data/vendor/libgit2/src/win32/findfile.h +5 -13
- data/vendor/libgit2/src/win32/git2.rc +44 -0
- data/vendor/libgit2/src/win32/map.c +39 -11
- data/vendor/libgit2/src/win32/mingw-compat.h +10 -11
- data/vendor/libgit2/src/win32/msvc-compat.h +10 -33
- data/vendor/libgit2/src/win32/path_w32.c +476 -0
- data/vendor/libgit2/src/win32/path_w32.h +104 -0
- data/vendor/libgit2/src/win32/posix.h +35 -30
- data/vendor/libgit2/src/win32/posix_w32.c +659 -327
- data/vendor/libgit2/src/win32/precompiled.h +7 -2
- data/vendor/libgit2/src/win32/reparse.h +57 -0
- data/vendor/libgit2/src/win32/thread.c +258 -0
- data/vendor/libgit2/src/win32/thread.h +64 -0
- data/vendor/libgit2/src/win32/utf-conv.c +127 -62
- data/vendor/libgit2/src/win32/utf-conv.h +47 -6
- data/vendor/libgit2/src/win32/version.h +21 -4
- data/vendor/libgit2/src/win32/w32_buffer.c +54 -0
- data/vendor/libgit2/src/win32/w32_buffer.h +20 -0
- data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.c +438 -0
- data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h +129 -0
- data/vendor/libgit2/src/win32/w32_stack.c +193 -0
- data/vendor/libgit2/src/win32/w32_stack.h +140 -0
- data/vendor/libgit2/src/win32/w32_util.c +95 -0
- data/vendor/libgit2/src/win32/w32_util.h +170 -0
- data/vendor/libgit2/src/win32/win32-compat.h +52 -0
- data/vendor/libgit2/src/worktree.c +578 -0
- data/vendor/libgit2/src/worktree.h +39 -0
- data/vendor/libgit2/src/xdiff/xdiff.h +33 -18
- data/vendor/libgit2/src/xdiff/xdiffi.c +578 -88
- data/vendor/libgit2/src/xdiff/xdiffi.h +3 -2
- data/vendor/libgit2/src/xdiff/xemit.c +106 -45
- data/vendor/libgit2/src/xdiff/xemit.h +3 -3
- data/vendor/libgit2/src/xdiff/xhistogram.c +5 -4
- data/vendor/libgit2/src/xdiff/xinclude.h +3 -2
- data/vendor/libgit2/src/xdiff/xmacros.h +2 -2
- data/vendor/libgit2/src/xdiff/xmerge.c +167 -48
- data/vendor/libgit2/src/xdiff/xpatience.c +42 -10
- data/vendor/libgit2/src/xdiff/xprepare.c +14 -14
- data/vendor/libgit2/src/xdiff/xprepare.h +2 -2
- data/vendor/libgit2/src/xdiff/xtypes.h +2 -2
- data/vendor/libgit2/src/xdiff/xutils.c +60 -56
- data/vendor/libgit2/src/xdiff/xutils.h +3 -5
- data/vendor/libgit2/src/zstream.c +205 -0
- data/vendor/libgit2/src/zstream.h +53 -0
- metadata +281 -233
- data/Rakefile +0 -61
- data/ext/rugged/rugged_diff_patch.c +0 -169
- data/lib/rugged/diff/patch.rb +0 -28
- data/test/blob_test.rb +0 -341
- data/test/branch_test.rb +0 -199
- data/test/commit_test.rb +0 -104
- data/test/config_test.rb +0 -45
- data/test/coverage/cover.rb +0 -133
- data/test/diff_test.rb +0 -777
- data/test/errors_test.rb +0 -34
- data/test/fixtures/alternate/objects/14/6ae76773c91e3b1d00cf7a338ec55ae58297e2 +0 -0
- data/test/fixtures/alternate/objects/14/9c32d47e99d0a3572ff1e70a2e0051bbf347a9 +0 -0
- data/test/fixtures/alternate/objects/14/fb3108588f9421bf764041e5e3ac305eb6277f +0 -0
- data/test/fixtures/archive.tar.gz +0 -0
- data/test/fixtures/attr/attr0 +0 -1
- data/test/fixtures/attr/attr1 +0 -29
- data/test/fixtures/attr/attr2 +0 -21
- data/test/fixtures/attr/attr3 +0 -4
- data/test/fixtures/attr/binfile +0 -1
- data/test/fixtures/attr/dir/file +0 -0
- data/test/fixtures/attr/file +0 -1
- data/test/fixtures/attr/gitattributes +0 -29
- data/test/fixtures/attr/gitignore +0 -2
- data/test/fixtures/attr/ign +0 -1
- data/test/fixtures/attr/macro_bad +0 -1
- data/test/fixtures/attr/macro_test +0 -1
- data/test/fixtures/attr/root_test1 +0 -1
- data/test/fixtures/attr/root_test2 +0 -6
- data/test/fixtures/attr/root_test3 +0 -19
- data/test/fixtures/attr/root_test4.txt +0 -14
- data/test/fixtures/attr/sub/abc +0 -37
- data/test/fixtures/attr/sub/dir/file +0 -0
- data/test/fixtures/attr/sub/file +0 -1
- data/test/fixtures/attr/sub/ign/file +0 -1
- data/test/fixtures/attr/sub/ign/sub/file +0 -1
- data/test/fixtures/attr/sub/sub/dir +0 -0
- data/test/fixtures/attr/sub/sub/file +0 -1
- data/test/fixtures/attr/sub/sub/subsub.txt +0 -1
- data/test/fixtures/attr/sub/subdir_test1 +0 -2
- data/test/fixtures/attr/sub/subdir_test2.txt +0 -1
- data/test/fixtures/diff/another.txt +0 -38
- data/test/fixtures/diff/readme.txt +0 -36
- data/test/fixtures/mergedrepo/conflicts-one.txt +0 -5
- data/test/fixtures/mergedrepo/conflicts-two.txt +0 -5
- data/test/fixtures/mergedrepo/one.txt +0 -10
- data/test/fixtures/mergedrepo/two.txt +0 -12
- data/test/fixtures/status/current_file +0 -1
- data/test/fixtures/status/ignored_file +0 -1
- data/test/fixtures/status/modified_file +0 -2
- data/test/fixtures/status/new_file +0 -1
- data/test/fixtures/status/staged_changes +0 -2
- data/test/fixtures/status/staged_changes_modified_file +0 -3
- data/test/fixtures/status/staged_delete_modified_file +0 -1
- data/test/fixtures/status/staged_new_file +0 -1
- data/test/fixtures/status/staged_new_file_modified_file +0 -2
- data/test/fixtures/status/subdir/current_file +0 -1
- data/test/fixtures/status/subdir/modified_file +0 -2
- data/test/fixtures/status/subdir/new_file +0 -1
- data/test/fixtures/status/subdir.txt +0 -2
- data/test/fixtures/status//350/277/231 +0 -1
- data/test/fixtures/testrepo.git/HEAD +0 -1
- data/test/fixtures/testrepo.git/config +0 -13
- data/test/fixtures/testrepo.git/description +0 -1
- data/test/fixtures/testrepo.git/index +0 -0
- data/test/fixtures/testrepo.git/info/exclude +0 -6
- data/test/fixtures/testrepo.git/logs/HEAD +0 -3
- data/test/fixtures/testrepo.git/logs/refs/heads/master +0 -3
- data/test/fixtures/testrepo.git/logs/refs/notes/commits +0 -1
- data/test/fixtures/testrepo.git/objects/0c/37a5391bbff43c37f0d0371823a5509eed5b1d +0 -0
- data/test/fixtures/testrepo.git/objects/13/85f264afb75a56a5bec74243be9b367ba4ca08 +0 -0
- data/test/fixtures/testrepo.git/objects/18/1037049a54a1eb5fab404658a3a250b44335d7 +0 -0
- data/test/fixtures/testrepo.git/objects/18/10dff58d8a660512d4832e740f692884338ccd +0 -0
- data/test/fixtures/testrepo.git/objects/2d/2eff63372b08adf0a9eb84109ccf7d19e2f3a2 +0 -0
- data/test/fixtures/testrepo.git/objects/36/060c58702ed4c2a40832c51758d5344201d89a +0 -2
- data/test/fixtures/testrepo.git/objects/44/1034f860c1d5d90e4188d11ae0d325176869a8 +0 -1
- data/test/fixtures/testrepo.git/objects/45/b983be36b73c0788dc9cbcb76cbb80fc7bb057 +0 -0
- data/test/fixtures/testrepo.git/objects/4a/202b346bb0fb0db7eff3cffeb3c70babbd2045 +0 -2
- data/test/fixtures/testrepo.git/objects/5b/5b025afb0b4c913b4c338a42934a3863bf3644 +0 -2
- data/test/fixtures/testrepo.git/objects/60/d415052a33de2150bf68757f6461df4f563ae4 +0 -0
- data/test/fixtures/testrepo.git/objects/61/9f9935957e010c419cb9d15621916ddfcc0b96 +0 -0
- data/test/fixtures/testrepo.git/objects/68/8a8f4ef7496901d15322972f96e212a9e466cc +0 -1
- data/test/fixtures/testrepo.git/objects/75/057dd4114e74cca1d750d0aee1647c903cb60a +0 -0
- data/test/fixtures/testrepo.git/objects/77/71329dfa3002caf8c61a0ceb62a31d09023f37 +0 -0
- data/test/fixtures/testrepo.git/objects/81/4889a078c031f61ed08ab5fa863aea9314344d +0 -0
- data/test/fixtures/testrepo.git/objects/84/96071c1b46c854b31185ea97743be6a8774479 +0 -0
- data/test/fixtures/testrepo.git/objects/94/eca2de348d5f672faf56b0decafa5937e3235e +0 -0
- data/test/fixtures/testrepo.git/objects/9b/7384fe1676186192842f5d3e129457b62db9e3 +0 -0
- data/test/fixtures/testrepo.git/objects/9f/d738e8f7967c078dceed8190330fc8648ee56a +0 -3
- data/test/fixtures/testrepo.git/objects/a4/a7dce85cf63874e984719f4fdd239f5145052f +0 -2
- data/test/fixtures/testrepo.git/objects/a7/1586c1dfe8a71c6cbf6c129f404c5642ff31bd +0 -0
- data/test/fixtures/testrepo.git/objects/a8/233120f6ad708f843d861ce2b7228ec4e3dec6 +0 -0
- data/test/fixtures/testrepo.git/objects/b7/4713326bc972cc15751ed504dca6f6f3b91f7a +0 -3
- data/test/fixtures/testrepo.git/objects/be/3563ae3f795b2b4353bcce3a527ad0a4f7f644 +0 -3
- data/test/fixtures/testrepo.git/objects/c4/7800c7266a2be04c571c04d5a6614691ea99bd +0 -3
- data/test/fixtures/testrepo.git/objects/c4/dc1555e4d4fa0e0c9c3fc46734c7c35b3ce90b +0 -0
- data/test/fixtures/testrepo.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 +0 -0
- data/test/fixtures/testrepo.git/objects/f6/0079018b664e4e79329a7ef9559c8d9e0378d1 +0 -0
- data/test/fixtures/testrepo.git/objects/fa/49b077972391ad58037050f2a75f74e3671e92 +0 -0
- data/test/fixtures/testrepo.git/objects/fd/093bff70906175335656e6ce6ae05783708765 +0 -0
- data/test/fixtures/testrepo.git/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.idx +0 -0
- data/test/fixtures/testrepo.git/objects/pack/pack-d7c6adf9f61318f041845b01440d09aa7a91e1b5.pack +0 -0
- data/test/fixtures/testrepo.git/packed-refs +0 -2
- data/test/fixtures/testrepo.git/refs/heads/master +0 -1
- data/test/fixtures/testrepo.git/refs/notes/commits +0 -1
- data/test/fixtures/testrepo.git/refs/tags/v0.9 +0 -1
- data/test/fixtures/testrepo.git/refs/tags/v1.0 +0 -1
- data/test/fixtures/text_file.md +0 -464
- data/test/fixtures/unsymlinked.git/HEAD +0 -1
- data/test/fixtures/unsymlinked.git/config +0 -6
- data/test/fixtures/unsymlinked.git/description +0 -1
- data/test/fixtures/unsymlinked.git/info/exclude +0 -2
- data/test/fixtures/unsymlinked.git/objects/08/8b64704e0d6b8bd061dea879418cb5442a3fbf +0 -0
- data/test/fixtures/unsymlinked.git/objects/13/a5e939bca25940c069fd2169d993dba328e30b +0 -0
- data/test/fixtures/unsymlinked.git/objects/19/bf568e59e3a0b363cafb4106226e62d4a4c41c +0 -0
- data/test/fixtures/unsymlinked.git/objects/58/1fadd35b4cf320d102a152f918729011604773 +0 -0
- data/test/fixtures/unsymlinked.git/objects/5c/87b6791e8b13da658a14d1ef7e09b5dc3bac8c +0 -0
- data/test/fixtures/unsymlinked.git/objects/6f/e5f5398af85fb3de8a6aba0339b6d3bfa26a27 +0 -0
- data/test/fixtures/unsymlinked.git/objects/7f/ccd75616ec188b8f1b23d67506a334cc34a49d +0 -0
- data/test/fixtures/unsymlinked.git/objects/80/6999882bf91d24241e4077906b9017605eb1f3 +0 -0
- data/test/fixtures/unsymlinked.git/objects/83/7d176303c5005505ec1e4a30231c40930c0230 +0 -0
- data/test/fixtures/unsymlinked.git/objects/a8/595ccca04f40818ae0155c8f9c77a230e597b6 +0 -2
- data/test/fixtures/unsymlinked.git/objects/cf/8f1cf5cce859c438d6cc067284cb5e161206e7 +0 -0
- data/test/fixtures/unsymlinked.git/objects/d5/278d05c8607ec420bfee4cf219fbc0eeebfd6a +0 -0
- data/test/fixtures/unsymlinked.git/objects/f4/e16fb76536591a41454194058d048d8e4dd2e9 +0 -0
- data/test/fixtures/unsymlinked.git/objects/f9/e65619d93fdf2673882e0a261c5e93b1a84006 +0 -0
- data/test/fixtures/unsymlinked.git/refs/heads/exe-file +0 -1
- data/test/fixtures/unsymlinked.git/refs/heads/master +0 -1
- data/test/fixtures/unsymlinked.git/refs/heads/reg-file +0 -1
- data/test/index_test.rb +0 -333
- data/test/lib_test.rb +0 -127
- data/test/note_test.rb +0 -158
- data/test/object_test.rb +0 -43
- data/test/reference_test.rb +0 -207
- data/test/remote_test.rb +0 -324
- data/test/repo_pack_test.rb +0 -24
- data/test/repo_reset_test.rb +0 -82
- data/test/repo_test.rb +0 -402
- data/test/tag_test.rb +0 -68
- data/test/test_helper.rb +0 -92
- data/test/tree_test.rb +0 -91
- data/test/walker_test.rb +0 -88
- data/vendor/libgit2/Makefile.embed +0 -42
- data/vendor/libgit2/include/git2/push.h +0 -131
- data/vendor/libgit2/include/git2/threads.h +0 -50
- data/vendor/libgit2/src/amiga/map.c +0 -48
- data/vendor/libgit2/src/bswap.h +0 -97
- data/vendor/libgit2/src/compress.c +0 -53
- data/vendor/libgit2/src/config_file.h +0 -60
- data/vendor/libgit2/src/delta-apply.c +0 -134
- data/vendor/libgit2/src/delta-apply.h +0 -50
- data/vendor/libgit2/src/diff_patch.c +0 -995
- data/vendor/libgit2/src/diff_patch.h +0 -46
- data/vendor/libgit2/src/hashsig.h +0 -72
- data/vendor/libgit2/src/merge_file.h +0 -71
- data/vendor/libgit2/src/win32/pthread.c +0 -144
- data/vendor/libgit2/src/win32/pthread.h +0 -50
data/vendor/libgit2/src/clone.c
CHANGED
@@ -5,6 +5,8 @@
|
|
5
5
|
* a Linking Exception. For full terms see the included COPYING file.
|
6
6
|
*/
|
7
7
|
|
8
|
+
#include "clone.h"
|
9
|
+
|
8
10
|
#include <assert.h>
|
9
11
|
|
10
12
|
#include "git2/clone.h"
|
@@ -16,21 +18,25 @@
|
|
16
18
|
#include "git2/commit.h"
|
17
19
|
#include "git2/tree.h"
|
18
20
|
|
19
|
-
#include "common.h"
|
20
21
|
#include "remote.h"
|
21
22
|
#include "fileops.h"
|
22
23
|
#include "refs.h"
|
23
24
|
#include "path.h"
|
24
25
|
#include "repository.h"
|
26
|
+
#include "odb.h"
|
27
|
+
|
28
|
+
static int clone_local_into(git_repository *repo, git_remote *remote, const git_fetch_options *fetch_opts, const git_checkout_options *co_opts, const char *branch, int link);
|
25
29
|
|
26
30
|
static int create_branch(
|
27
31
|
git_reference **branch,
|
28
32
|
git_repository *repo,
|
29
33
|
const git_oid *target,
|
30
|
-
const char *name
|
34
|
+
const char *name,
|
35
|
+
const char *log_message)
|
31
36
|
{
|
32
37
|
git_commit *head_obj = NULL;
|
33
38
|
git_reference *branch_ref = NULL;
|
39
|
+
git_buf refname = GIT_BUF_INIT;
|
34
40
|
int error;
|
35
41
|
|
36
42
|
/* Find the target commit */
|
@@ -38,8 +44,11 @@ static int create_branch(
|
|
38
44
|
return error;
|
39
45
|
|
40
46
|
/* Create the new branch */
|
41
|
-
error =
|
47
|
+
if ((error = git_buf_printf(&refname, GIT_REFS_HEADS_DIR "%s", name)) < 0)
|
48
|
+
return error;
|
42
49
|
|
50
|
+
error = git_reference_create(&branch_ref, repo, git_buf_cstr(&refname), target, 0, log_message);
|
51
|
+
git_buf_dispose(&refname);
|
43
52
|
git_commit_free(head_obj);
|
44
53
|
|
45
54
|
if (!error)
|
@@ -78,8 +87,8 @@ static int setup_tracking_config(
|
|
78
87
|
error = 0;
|
79
88
|
|
80
89
|
cleanup:
|
81
|
-
|
82
|
-
|
90
|
+
git_buf_dispose(&remote_key);
|
91
|
+
git_buf_dispose(&merge_key);
|
83
92
|
return error;
|
84
93
|
}
|
85
94
|
|
@@ -87,11 +96,12 @@ static int create_tracking_branch(
|
|
87
96
|
git_reference **branch,
|
88
97
|
git_repository *repo,
|
89
98
|
const git_oid *target,
|
90
|
-
const char *branch_name
|
99
|
+
const char *branch_name,
|
100
|
+
const char *log_message)
|
91
101
|
{
|
92
102
|
int error;
|
93
103
|
|
94
|
-
if ((error = create_branch(branch, repo, target, branch_name)) < 0)
|
104
|
+
if ((error = create_branch(branch, repo, target, branch_name, log_message)) < 0)
|
95
105
|
return error;
|
96
106
|
|
97
107
|
return setup_tracking_config(
|
@@ -101,199 +111,143 @@ static int create_tracking_branch(
|
|
101
111
|
git_reference_name(*branch));
|
102
112
|
}
|
103
113
|
|
104
|
-
struct head_info {
|
105
|
-
git_repository *repo;
|
106
|
-
git_oid remote_head_oid;
|
107
|
-
git_buf branchname;
|
108
|
-
const git_refspec *refspec;
|
109
|
-
bool found;
|
110
|
-
};
|
111
|
-
|
112
|
-
static int reference_matches_remote_head(
|
113
|
-
const char *reference_name,
|
114
|
-
void *payload)
|
115
|
-
{
|
116
|
-
struct head_info *head_info = (struct head_info *)payload;
|
117
|
-
git_oid oid;
|
118
|
-
|
119
|
-
/* TODO: Should we guard against references
|
120
|
-
* which name doesn't start with refs/heads/ ?
|
121
|
-
*/
|
122
|
-
|
123
|
-
/* Stop looking if we've already found a match */
|
124
|
-
if (head_info->found)
|
125
|
-
return 0;
|
126
|
-
|
127
|
-
if (git_reference_name_to_id(
|
128
|
-
&oid,
|
129
|
-
head_info->repo,
|
130
|
-
reference_name) < 0) {
|
131
|
-
/* If the reference doesn't exists, it obviously cannot match the expected oid. */
|
132
|
-
giterr_clear();
|
133
|
-
return 0;
|
134
|
-
}
|
135
|
-
|
136
|
-
if (git_oid__cmp(&head_info->remote_head_oid, &oid) == 0) {
|
137
|
-
/* Determine the local reference name from the remote tracking one */
|
138
|
-
if (git_refspec_transform_l(
|
139
|
-
&head_info->branchname,
|
140
|
-
head_info->refspec,
|
141
|
-
reference_name) < 0)
|
142
|
-
return -1;
|
143
|
-
|
144
|
-
if (git_buf_len(&head_info->branchname) > 0) {
|
145
|
-
if (git_buf_sets(
|
146
|
-
&head_info->branchname,
|
147
|
-
git_buf_cstr(&head_info->branchname) + strlen(GIT_REFS_HEADS_DIR)) < 0)
|
148
|
-
return -1;
|
149
|
-
|
150
|
-
head_info->found = 1;
|
151
|
-
}
|
152
|
-
}
|
153
|
-
|
154
|
-
return 0;
|
155
|
-
}
|
156
|
-
|
157
114
|
static int update_head_to_new_branch(
|
158
115
|
git_repository *repo,
|
159
116
|
const git_oid *target,
|
160
|
-
const char *name
|
117
|
+
const char *name,
|
118
|
+
const char *reflog_message)
|
161
119
|
{
|
162
120
|
git_reference *tracking_branch = NULL;
|
163
121
|
int error;
|
164
122
|
|
165
|
-
if ((
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
return error;
|
123
|
+
if (!git__prefixcmp(name, GIT_REFS_HEADS_DIR))
|
124
|
+
name += strlen(GIT_REFS_HEADS_DIR);
|
125
|
+
|
126
|
+
error = create_tracking_branch(&tracking_branch, repo, target, name,
|
127
|
+
reflog_message);
|
171
128
|
|
172
|
-
|
129
|
+
if (!error)
|
130
|
+
error = git_repository_set_head(
|
131
|
+
repo, git_reference_name(tracking_branch));
|
173
132
|
|
174
133
|
git_reference_free(tracking_branch);
|
175
134
|
|
176
|
-
|
177
|
-
|
135
|
+
/* if it already existed, then the user's refspec created it for us, ignore it' */
|
136
|
+
if (error == GIT_EEXISTS)
|
137
|
+
error = 0;
|
178
138
|
|
179
|
-
|
180
|
-
{
|
181
|
-
git_remote_head **destination = (git_remote_head **)payload;
|
182
|
-
|
183
|
-
/* Save the first entry, and terminate the enumeration */
|
184
|
-
*destination = head;
|
185
|
-
return 1;
|
139
|
+
return error;
|
186
140
|
}
|
187
141
|
|
188
|
-
static int update_head_to_remote(
|
142
|
+
static int update_head_to_remote(
|
143
|
+
git_repository *repo,
|
144
|
+
git_remote *remote,
|
145
|
+
const char *reflog_message)
|
189
146
|
{
|
190
|
-
int
|
191
|
-
|
192
|
-
|
193
|
-
|
147
|
+
int error = 0;
|
148
|
+
size_t refs_len;
|
149
|
+
git_refspec *refspec;
|
150
|
+
const git_remote_head *remote_head, **refs;
|
151
|
+
const git_oid *remote_head_id;
|
194
152
|
git_buf remote_master_name = GIT_BUF_INIT;
|
153
|
+
git_buf branch = GIT_BUF_INIT;
|
195
154
|
|
196
|
-
|
197
|
-
|
198
|
-
return setup_tracking_config(
|
199
|
-
repo,
|
200
|
-
"master",
|
201
|
-
GIT_REMOTE_ORIGIN,
|
202
|
-
GIT_REFS_HEADS_MASTER_FILE);
|
203
|
-
}
|
155
|
+
if ((error = git_remote_ls(&refs, &refs_len, remote)) < 0)
|
156
|
+
return error;
|
204
157
|
|
205
|
-
/*
|
206
|
-
|
207
|
-
|
208
|
-
|
209
|
-
return -1;
|
158
|
+
/* We cloned an empty repository or one with an unborn HEAD */
|
159
|
+
if (refs_len == 0 || strcmp(refs[0]->name, GIT_HEAD_FILE))
|
160
|
+
return setup_tracking_config(
|
161
|
+
repo, "master", GIT_REMOTE_ORIGIN, GIT_REFS_HEADS_MASTER_FILE);
|
210
162
|
|
163
|
+
/* We know we have HEAD, let's see where it points */
|
164
|
+
remote_head = refs[0];
|
211
165
|
assert(remote_head);
|
212
166
|
|
213
|
-
|
214
|
-
git_buf_init(&head_info.branchname, 16);
|
215
|
-
head_info.repo = repo;
|
216
|
-
head_info.refspec = git_remote__matching_refspec(remote, GIT_REFS_HEADS_MASTER_FILE);
|
217
|
-
head_info.found = 0;
|
167
|
+
remote_head_id = &remote_head->oid;
|
218
168
|
|
219
|
-
|
220
|
-
|
221
|
-
|
222
|
-
|
223
|
-
|
224
|
-
/* Determine the remote tracking reference name from the local master */
|
225
|
-
if (git_refspec_transform_r(
|
226
|
-
&remote_master_name,
|
227
|
-
head_info.refspec,
|
228
|
-
GIT_REFS_HEADS_MASTER_FILE) < 0)
|
229
|
-
return -1;
|
230
|
-
|
231
|
-
/* Check to see if the remote HEAD points to the remote master */
|
232
|
-
if (reference_matches_remote_head(git_buf_cstr(&remote_master_name), &head_info) < 0)
|
169
|
+
error = git_remote_default_branch(&branch, remote);
|
170
|
+
if (error == GIT_ENOTFOUND) {
|
171
|
+
error = git_repository_set_head_detached(
|
172
|
+
repo, remote_head_id);
|
233
173
|
goto cleanup;
|
174
|
+
}
|
234
175
|
|
235
|
-
|
236
|
-
retcode = update_head_to_new_branch(
|
237
|
-
repo,
|
238
|
-
&head_info.remote_head_oid,
|
239
|
-
git_buf_cstr(&head_info.branchname));
|
176
|
+
refspec = git_remote__matching_refspec(remote, git_buf_cstr(&branch));
|
240
177
|
|
178
|
+
if (refspec == NULL) {
|
179
|
+
git_error_set(GIT_ERROR_NET, "the remote's default branch does not fit the refspec configuration");
|
180
|
+
error = GIT_EINVALIDSPEC;
|
241
181
|
goto cleanup;
|
242
182
|
}
|
243
183
|
|
244
|
-
/*
|
245
|
-
if (
|
246
|
-
|
247
|
-
|
248
|
-
&
|
249
|
-
goto cleanup;
|
250
|
-
|
251
|
-
if (head_info.found) {
|
252
|
-
retcode = update_head_to_new_branch(
|
253
|
-
repo,
|
254
|
-
&head_info.remote_head_oid,
|
255
|
-
git_buf_cstr(&head_info.branchname));
|
256
|
-
|
257
|
-
goto cleanup;
|
258
|
-
} else {
|
259
|
-
retcode = git_repository_set_head_detached(
|
260
|
-
repo,
|
261
|
-
&head_info.remote_head_oid);
|
184
|
+
/* Determine the remote tracking reference name from the local master */
|
185
|
+
if ((error = git_refspec_transform(
|
186
|
+
&remote_master_name,
|
187
|
+
refspec,
|
188
|
+
git_buf_cstr(&branch))) < 0)
|
262
189
|
goto cleanup;
|
263
|
-
|
190
|
+
|
191
|
+
error = update_head_to_new_branch(
|
192
|
+
repo,
|
193
|
+
remote_head_id,
|
194
|
+
git_buf_cstr(&branch),
|
195
|
+
reflog_message);
|
264
196
|
|
265
197
|
cleanup:
|
266
|
-
|
267
|
-
|
268
|
-
|
198
|
+
git_buf_dispose(&remote_master_name);
|
199
|
+
git_buf_dispose(&branch);
|
200
|
+
|
201
|
+
return error;
|
269
202
|
}
|
270
203
|
|
271
204
|
static int update_head_to_branch(
|
272
205
|
git_repository *repo,
|
273
|
-
const
|
206
|
+
const char *remote_name,
|
207
|
+
const char *branch,
|
208
|
+
const char *reflog_message)
|
274
209
|
{
|
275
210
|
int retcode;
|
276
211
|
git_buf remote_branch_name = GIT_BUF_INIT;
|
277
212
|
git_reference* remote_ref = NULL;
|
278
213
|
|
279
|
-
assert(
|
214
|
+
assert(remote_name && branch);
|
280
215
|
|
281
216
|
if ((retcode = git_buf_printf(&remote_branch_name, GIT_REFS_REMOTES_DIR "%s/%s",
|
282
|
-
|
217
|
+
remote_name, branch)) < 0 )
|
283
218
|
goto cleanup;
|
284
219
|
|
285
220
|
if ((retcode = git_reference_lookup(&remote_ref, repo, git_buf_cstr(&remote_branch_name))) < 0)
|
286
221
|
goto cleanup;
|
287
222
|
|
288
|
-
retcode = update_head_to_new_branch(repo, git_reference_target(remote_ref),
|
289
|
-
|
223
|
+
retcode = update_head_to_new_branch(repo, git_reference_target(remote_ref), branch,
|
224
|
+
reflog_message);
|
290
225
|
|
291
226
|
cleanup:
|
292
227
|
git_reference_free(remote_ref);
|
293
|
-
|
228
|
+
git_buf_dispose(&remote_branch_name);
|
294
229
|
return retcode;
|
295
230
|
}
|
296
231
|
|
232
|
+
static int default_repository_create(git_repository **out, const char *path, int bare, void *payload)
|
233
|
+
{
|
234
|
+
GIT_UNUSED(payload);
|
235
|
+
|
236
|
+
return git_repository_init(out, path, bare);
|
237
|
+
}
|
238
|
+
|
239
|
+
static int default_remote_create(
|
240
|
+
git_remote **out,
|
241
|
+
git_repository *repo,
|
242
|
+
const char *name,
|
243
|
+
const char *url,
|
244
|
+
void *payload)
|
245
|
+
{
|
246
|
+
GIT_UNUSED(payload);
|
247
|
+
|
248
|
+
return git_remote_create(out, repo, name, url);
|
249
|
+
}
|
250
|
+
|
297
251
|
/*
|
298
252
|
* submodules?
|
299
253
|
*/
|
@@ -306,42 +260,24 @@ static int create_and_configure_origin(
|
|
306
260
|
{
|
307
261
|
int error;
|
308
262
|
git_remote *origin = NULL;
|
263
|
+
char buf[GIT_PATH_MAX];
|
264
|
+
git_remote_create_cb remote_create = options->remote_cb;
|
265
|
+
void *payload = options->remote_cb_payload;
|
309
266
|
|
310
|
-
|
311
|
-
|
312
|
-
|
313
|
-
|
314
|
-
options->cred_acquire_payload);
|
315
|
-
git_remote_set_autotag(origin, options->remote_autotag);
|
316
|
-
/*
|
317
|
-
* Don't write FETCH_HEAD, we'll check out the remote tracking
|
318
|
-
* branch ourselves based on the server's default.
|
319
|
-
*/
|
320
|
-
git_remote_set_update_fetchhead(origin, 0);
|
321
|
-
|
322
|
-
if (options->remote_callbacks &&
|
323
|
-
(error = git_remote_set_callbacks(origin, options->remote_callbacks)) < 0)
|
324
|
-
goto on_error;
|
267
|
+
/* If the path exists and is a dir, the url should be the absolute path */
|
268
|
+
if (git_path_root(url) < 0 && git_path_exists(url) && git_path_isdir(url)) {
|
269
|
+
if (p_realpath(url, buf) == NULL)
|
270
|
+
return -1;
|
325
271
|
|
326
|
-
|
327
|
-
git_remote_clear_refspecs(origin);
|
328
|
-
if ((error = git_remote_add_fetch(origin, options->fetch_spec)) < 0)
|
329
|
-
goto on_error;
|
272
|
+
url = buf;
|
330
273
|
}
|
331
274
|
|
332
|
-
if (
|
333
|
-
|
334
|
-
|
335
|
-
|
336
|
-
if (options->pushurl &&
|
337
|
-
(error = git_remote_set_pushurl(origin, options->pushurl)) < 0)
|
338
|
-
goto on_error;
|
339
|
-
|
340
|
-
if (options->transport_flags == GIT_TRANSPORTFLAGS_NO_CHECK_CERT) {
|
341
|
-
git_remote_check_cert(origin, 0);
|
342
|
-
}
|
275
|
+
if (!remote_create) {
|
276
|
+
remote_create = default_remote_create;
|
277
|
+
payload = NULL;
|
278
|
+
}
|
343
279
|
|
344
|
-
if ((error =
|
280
|
+
if ((error = remote_create(&origin, repo, "origin", url, payload)) < 0)
|
345
281
|
goto on_error;
|
346
282
|
|
347
283
|
*out = origin;
|
@@ -352,127 +288,271 @@ on_error:
|
|
352
288
|
return error;
|
353
289
|
}
|
354
290
|
|
355
|
-
|
356
|
-
|
357
|
-
|
358
|
-
|
359
|
-
const git_clone_options *options)
|
291
|
+
static bool should_checkout(
|
292
|
+
git_repository *repo,
|
293
|
+
bool is_bare,
|
294
|
+
const git_checkout_options *opts)
|
360
295
|
{
|
361
|
-
|
362
|
-
|
363
|
-
|
364
|
-
/* Construct an origin remote */
|
365
|
-
if ((retcode = create_and_configure_origin(&origin, repo, url, options)) < 0)
|
366
|
-
goto on_error;
|
367
|
-
|
368
|
-
git_remote_set_update_fetchhead(origin, 0);
|
296
|
+
if (is_bare)
|
297
|
+
return false;
|
369
298
|
|
370
|
-
|
371
|
-
|
372
|
-
* on the initial clone, but do not want to persist the value in the
|
373
|
-
* configuration file.
|
374
|
-
*/
|
375
|
-
if (origin->download_tags == GIT_REMOTE_DOWNLOAD_TAGS_AUTO &&
|
376
|
-
((retcode = git_remote_add_fetch(origin, "refs/tags/*:refs/tags/*")) < 0))
|
377
|
-
goto on_error;
|
299
|
+
if (!opts)
|
300
|
+
return false;
|
378
301
|
|
379
|
-
|
380
|
-
|
381
|
-
goto on_error;
|
302
|
+
if (opts->checkout_strategy == GIT_CHECKOUT_NONE)
|
303
|
+
return false;
|
382
304
|
|
383
|
-
|
384
|
-
|
385
|
-
goto on_error;
|
305
|
+
return !git_repository_head_unborn(repo);
|
306
|
+
}
|
386
307
|
|
387
|
-
|
388
|
-
|
389
|
-
|
308
|
+
static int checkout_branch(git_repository *repo, git_remote *remote, const git_checkout_options *co_opts, const char *branch, const char *reflog_message)
|
309
|
+
{
|
310
|
+
int error;
|
390
311
|
|
391
|
-
|
392
|
-
|
393
|
-
|
312
|
+
if (branch)
|
313
|
+
error = update_head_to_branch(repo, git_remote_name(remote), branch,
|
314
|
+
reflog_message);
|
394
315
|
/* Point HEAD to the same ref as the remote's head */
|
395
316
|
else
|
396
|
-
|
317
|
+
error = update_head_to_remote(repo, remote, reflog_message);
|
397
318
|
|
398
|
-
|
399
|
-
|
400
|
-
return retcode;
|
401
|
-
}
|
319
|
+
if (!error && should_checkout(repo, git_repository_is_bare(repo), co_opts))
|
320
|
+
error = git_checkout_head(repo, co_opts);
|
402
321
|
|
322
|
+
return error;
|
323
|
+
}
|
403
324
|
|
404
|
-
static
|
405
|
-
git_repository *repo,
|
406
|
-
bool is_bare,
|
407
|
-
git_checkout_opts *opts)
|
325
|
+
static int clone_into(git_repository *repo, git_remote *_remote, const git_fetch_options *opts, const git_checkout_options *co_opts, const char *branch)
|
408
326
|
{
|
409
|
-
|
410
|
-
|
327
|
+
int error;
|
328
|
+
git_buf reflog_message = GIT_BUF_INIT;
|
329
|
+
git_fetch_options fetch_opts;
|
330
|
+
git_remote *remote;
|
411
331
|
|
412
|
-
|
413
|
-
return false;
|
332
|
+
assert(repo && _remote);
|
414
333
|
|
415
|
-
if (
|
416
|
-
|
334
|
+
if (!git_repository_is_empty(repo)) {
|
335
|
+
git_error_set(GIT_ERROR_INVALID, "the repository is not empty");
|
336
|
+
return -1;
|
337
|
+
}
|
338
|
+
|
339
|
+
if ((error = git_remote_dup(&remote, _remote)) < 0)
|
340
|
+
return error;
|
417
341
|
|
418
|
-
|
342
|
+
memcpy(&fetch_opts, opts, sizeof(git_fetch_options));
|
343
|
+
fetch_opts.update_fetchhead = 0;
|
344
|
+
fetch_opts.download_tags = GIT_REMOTE_DOWNLOAD_TAGS_ALL;
|
345
|
+
git_buf_printf(&reflog_message, "clone: from %s", git_remote_url(remote));
|
346
|
+
|
347
|
+
if ((error = git_remote_fetch(remote, NULL, &fetch_opts, git_buf_cstr(&reflog_message))) != 0)
|
348
|
+
goto cleanup;
|
349
|
+
|
350
|
+
error = checkout_branch(repo, remote, co_opts, branch, git_buf_cstr(&reflog_message));
|
351
|
+
|
352
|
+
cleanup:
|
353
|
+
git_remote_free(remote);
|
354
|
+
git_buf_dispose(&reflog_message);
|
355
|
+
|
356
|
+
return error;
|
419
357
|
}
|
420
358
|
|
421
|
-
|
359
|
+
int git_clone__should_clone_local(const char *url_or_path, git_clone_local_t local)
|
422
360
|
{
|
423
|
-
|
424
|
-
|
361
|
+
git_buf fromurl = GIT_BUF_INIT;
|
362
|
+
const char *path = url_or_path;
|
363
|
+
bool is_url, is_local;
|
364
|
+
|
365
|
+
if (local == GIT_CLONE_NO_LOCAL)
|
366
|
+
return 0;
|
425
367
|
|
426
|
-
|
368
|
+
if ((is_url = git_path_is_local_file_url(url_or_path)) != 0) {
|
369
|
+
if (git_path_fromurl(&fromurl, url_or_path) < 0) {
|
370
|
+
is_local = -1;
|
371
|
+
goto done;
|
372
|
+
}
|
373
|
+
|
374
|
+
path = fromurl.ptr;
|
375
|
+
}
|
427
376
|
|
428
|
-
|
429
|
-
|
377
|
+
is_local = (!is_url || local != GIT_CLONE_LOCAL_AUTO) &&
|
378
|
+
git_path_isdir(path);
|
379
|
+
|
380
|
+
done:
|
381
|
+
git_buf_dispose(&fromurl);
|
382
|
+
return is_local;
|
430
383
|
}
|
431
384
|
|
432
385
|
int git_clone(
|
433
386
|
git_repository **out,
|
434
387
|
const char *url,
|
435
388
|
const char *local_path,
|
436
|
-
const git_clone_options *
|
389
|
+
const git_clone_options *_options)
|
437
390
|
{
|
438
|
-
int
|
391
|
+
int error = 0;
|
439
392
|
git_repository *repo = NULL;
|
440
|
-
|
441
|
-
|
393
|
+
git_remote *origin;
|
394
|
+
git_clone_options options = GIT_CLONE_OPTIONS_INIT;
|
395
|
+
uint32_t rmdir_flags = GIT_RMDIR_REMOVE_FILES;
|
396
|
+
git_repository_create_cb repository_cb;
|
442
397
|
|
443
398
|
assert(out && url && local_path);
|
444
399
|
|
445
|
-
|
446
|
-
|
400
|
+
if (_options)
|
401
|
+
memcpy(&options, _options, sizeof(git_clone_options));
|
402
|
+
|
403
|
+
GIT_ERROR_CHECK_VERSION(&options, GIT_CLONE_OPTIONS_VERSION, "git_clone_options");
|
447
404
|
|
448
405
|
/* Only clone to a new directory or an empty directory */
|
449
406
|
if (git_path_exists(local_path) && !git_path_is_empty_dir(local_path)) {
|
450
|
-
|
407
|
+
git_error_set(GIT_ERROR_INVALID,
|
451
408
|
"'%s' exists and is not an empty directory", local_path);
|
452
|
-
return
|
409
|
+
return GIT_EEXISTS;
|
453
410
|
}
|
454
411
|
|
455
|
-
/* Only remove the directory on failure if we create it */
|
456
|
-
|
412
|
+
/* Only remove the root directory on failure if we create it */
|
413
|
+
if (git_path_exists(local_path))
|
414
|
+
rmdir_flags |= GIT_RMDIR_SKIP_ROOT;
|
457
415
|
|
458
|
-
if (
|
459
|
-
|
460
|
-
|
461
|
-
|
416
|
+
if (options.repository_cb)
|
417
|
+
repository_cb = options.repository_cb;
|
418
|
+
else
|
419
|
+
repository_cb = default_repository_create;
|
462
420
|
|
463
|
-
|
464
|
-
|
465
|
-
else
|
466
|
-
git_futils_cleanupdir_r(local_path);
|
421
|
+
if ((error = repository_cb(&repo, local_path, options.bare, options.repository_cb_payload)) < 0)
|
422
|
+
return error;
|
467
423
|
|
468
|
-
|
469
|
-
|
470
|
-
|
471
|
-
|
424
|
+
if (!(error = create_and_configure_origin(&origin, repo, url, &options))) {
|
425
|
+
int clone_local = git_clone__should_clone_local(url, options.local);
|
426
|
+
int link = options.local != GIT_CLONE_LOCAL_NO_LINKS;
|
427
|
+
|
428
|
+
if (clone_local == 1)
|
429
|
+
error = clone_local_into(
|
430
|
+
repo, origin, &options.fetch_opts, &options.checkout_opts,
|
431
|
+
options.checkout_branch, link);
|
432
|
+
else if (clone_local == 0)
|
433
|
+
error = clone_into(
|
434
|
+
repo, origin, &options.fetch_opts, &options.checkout_opts,
|
435
|
+
options.checkout_branch);
|
436
|
+
else
|
437
|
+
error = -1;
|
438
|
+
|
439
|
+
git_remote_free(origin);
|
472
440
|
}
|
473
441
|
|
474
|
-
if (
|
475
|
-
|
442
|
+
if (error != 0) {
|
443
|
+
git_error_state last_error = {0};
|
444
|
+
git_error_state_capture(&last_error, error);
|
476
445
|
|
477
|
-
|
446
|
+
git_repository_free(repo);
|
447
|
+
repo = NULL;
|
448
|
+
|
449
|
+
(void)git_futils_rmdir_r(local_path, NULL, rmdir_flags);
|
450
|
+
|
451
|
+
git_error_state_restore(&last_error);
|
452
|
+
}
|
453
|
+
|
454
|
+
*out = repo;
|
455
|
+
return error;
|
456
|
+
}
|
457
|
+
|
458
|
+
int git_clone_init_options(git_clone_options *opts, unsigned int version)
|
459
|
+
{
|
460
|
+
GIT_INIT_STRUCTURE_FROM_TEMPLATE(
|
461
|
+
opts, version, git_clone_options, GIT_CLONE_OPTIONS_INIT);
|
462
|
+
return 0;
|
463
|
+
}
|
464
|
+
|
465
|
+
static bool can_link(const char *src, const char *dst, int link)
|
466
|
+
{
|
467
|
+
#ifdef GIT_WIN32
|
468
|
+
GIT_UNUSED(src);
|
469
|
+
GIT_UNUSED(dst);
|
470
|
+
GIT_UNUSED(link);
|
471
|
+
return false;
|
472
|
+
#else
|
473
|
+
|
474
|
+
struct stat st_src, st_dst;
|
475
|
+
|
476
|
+
if (!link)
|
477
|
+
return false;
|
478
|
+
|
479
|
+
if (p_stat(src, &st_src) < 0)
|
480
|
+
return false;
|
481
|
+
|
482
|
+
if (p_stat(dst, &st_dst) < 0)
|
483
|
+
return false;
|
484
|
+
|
485
|
+
return st_src.st_dev == st_dst.st_dev;
|
486
|
+
#endif
|
487
|
+
}
|
488
|
+
|
489
|
+
static int clone_local_into(git_repository *repo, git_remote *remote, const git_fetch_options *fetch_opts, const git_checkout_options *co_opts, const char *branch, int link)
|
490
|
+
{
|
491
|
+
int error, flags;
|
492
|
+
git_repository *src;
|
493
|
+
git_buf src_odb = GIT_BUF_INIT, dst_odb = GIT_BUF_INIT, src_path = GIT_BUF_INIT;
|
494
|
+
git_buf reflog_message = GIT_BUF_INIT;
|
495
|
+
|
496
|
+
assert(repo && remote);
|
497
|
+
|
498
|
+
if (!git_repository_is_empty(repo)) {
|
499
|
+
git_error_set(GIT_ERROR_INVALID, "the repository is not empty");
|
500
|
+
return -1;
|
501
|
+
}
|
502
|
+
|
503
|
+
/*
|
504
|
+
* Let's figure out what path we should use for the source
|
505
|
+
* repo, if it's not rooted, the path should be relative to
|
506
|
+
* the repository's worktree/gitdir.
|
507
|
+
*/
|
508
|
+
if ((error = git_path_from_url_or_path(&src_path, git_remote_url(remote))) < 0)
|
509
|
+
return error;
|
510
|
+
|
511
|
+
/* Copy .git/objects/ from the source to the target */
|
512
|
+
if ((error = git_repository_open(&src, git_buf_cstr(&src_path))) < 0) {
|
513
|
+
git_buf_dispose(&src_path);
|
514
|
+
return error;
|
515
|
+
}
|
516
|
+
|
517
|
+
if (git_repository_item_path(&src_odb, src, GIT_REPOSITORY_ITEM_OBJECTS) < 0
|
518
|
+
|| git_repository_item_path(&dst_odb, repo, GIT_REPOSITORY_ITEM_OBJECTS) < 0) {
|
519
|
+
error = -1;
|
520
|
+
goto cleanup;
|
521
|
+
}
|
522
|
+
|
523
|
+
flags = 0;
|
524
|
+
if (can_link(git_repository_path(src), git_repository_path(repo), link))
|
525
|
+
flags |= GIT_CPDIR_LINK_FILES;
|
526
|
+
|
527
|
+
error = git_futils_cp_r(git_buf_cstr(&src_odb), git_buf_cstr(&dst_odb),
|
528
|
+
flags, GIT_OBJECT_DIR_MODE);
|
529
|
+
|
530
|
+
/*
|
531
|
+
* can_link() doesn't catch all variations, so if we hit an
|
532
|
+
* error and did want to link, let's try again without trying
|
533
|
+
* to link.
|
534
|
+
*/
|
535
|
+
if (error < 0 && link) {
|
536
|
+
flags &= ~GIT_CPDIR_LINK_FILES;
|
537
|
+
error = git_futils_cp_r(git_buf_cstr(&src_odb), git_buf_cstr(&dst_odb),
|
538
|
+
flags, GIT_OBJECT_DIR_MODE);
|
539
|
+
}
|
540
|
+
|
541
|
+
if (error < 0)
|
542
|
+
goto cleanup;
|
543
|
+
|
544
|
+
git_buf_printf(&reflog_message, "clone: from %s", git_remote_url(remote));
|
545
|
+
|
546
|
+
if ((error = git_remote_fetch(remote, NULL, fetch_opts, git_buf_cstr(&reflog_message))) != 0)
|
547
|
+
goto cleanup;
|
548
|
+
|
549
|
+
error = checkout_branch(repo, remote, co_opts, branch, git_buf_cstr(&reflog_message));
|
550
|
+
|
551
|
+
cleanup:
|
552
|
+
git_buf_dispose(&reflog_message);
|
553
|
+
git_buf_dispose(&src_path);
|
554
|
+
git_buf_dispose(&src_odb);
|
555
|
+
git_buf_dispose(&dst_odb);
|
556
|
+
git_repository_free(src);
|
557
|
+
return error;
|
478
558
|
}
|